[NFC][core] group core subdirectories by topic

cmake/unix/makepchinput.py

@@ -346,6 +346,7 @@ def copyLinkDefs(rootSrcDir, outdir):
    os.chdir(rootSrcDir)
    wildcards = (os.path.join("*", "inc", "*LinkDef*.h"),
                 os.path.join("*", "*", "inc", "*LinkDef*.h"),
+                os.path.join("*", "*", "*", "inc", "*LinkDef*.h"),
                 os.path.join("*", "*", "inc", "*" , "*LinkDef*.h"))
    linkDefNames = []
    for wildcard in wildcards:

core/CMakeLists.txt

@@ -72,23 +72,16 @@ add_subdirectory(cont)
 add_subdirectory(dictgen)
 add_subdirectory(foundation)
 add_subdirectory(gui)
-add_subdirectory(imt)
 add_subdirectory(meta)
 add_subdirectory(metacling)
-add_subdirectory(multiproc)
 add_subdirectory(newdelete)
 add_subdirectory(rint)
 add_subdirectory(testsupport)
 add_subdirectory(textinput)
-add_subdirectory(thread)
-add_subdirectory(zip)
-add_subdirectory(lzma)
-add_subdirectory(lz4)
-add_subdirectory(zstd)
-
-add_subdirectory(macosx)
-add_subdirectory(unix)
-add_subdirectory(winnt)
+
+add_subdirectory(compression)
+add_subdirectory(os)
+add_subdirectory(parallel)
 
 #-------------------------------------------------------------------------------
 

core/base/inc/LinkDef.h

@@ -5,14 +5,14 @@
 #include "../../meta/inc/LinkDef.h"
 
 #if defined(SYSTEM_TYPE_winnt)
-#include "../../winnt/inc/LinkDef.h"
+#include "../../os/winnt/inc/LinkDef.h"
 #elif defined(SYSTEM_TYPE_macosx)
 #if defined(R__HAS_COCOA)
-#include "../../macosx/inc/LinkDef.h"
+#include "../../os/macosx/inc/LinkDef.h"
 #endif
-#include "../../unix/inc/LinkDef.h"
+#include "../../os/unix/inc/LinkDef.h"
 #elif defined(SYSTEM_TYPE_unix)
-#include "../../unix/inc/LinkDef.h"
+#include "../../os/unix/inc/LinkDef.h"
 #else
 # error "Unsupported system type."
 #endif

core/compression/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_subdirectory(zip)
+add_subdirectory(lzma)
+add_subdirectory(lz4)
+add_subdirectory(zstd)

core/lzma/CMakeLists.txt → core/compression/lzma/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/lzma package
+# CMakeLists.txt file for building ROOT core/compression/lzma package
 ############################################################################
 
 target_sources(Core PRIVATE src/ZipLZMA.c)

core/zstd/CMakeLists.txt → core/compression/zstd/CMakeLists.txt

@@ -1,5 +1,5 @@
 ############################################################################
-# CMakeLists.txt file for building ROOT core/zstd package
+# CMakeLists.txt file for building ROOT core/compression/zstd package
 ############################################################################
 
 find_package(ZSTD REQUIRED)

core/foundation/CMakeLists.txt

@@ -52,7 +52,7 @@ target_include_directories(Foundation_Stage1
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
   PRIVATE
-    $<$<BOOL:${MSVC}>:${CMAKE_SOURCE_DIR}/core/winnt/inc>
+    $<$<BOOL:${MSVC}>:${CMAKE_SOURCE_DIR}/core/os/winnt/inc>
     ${CMAKE_BINARY_DIR}/ginclude res
 )
 

core/metacling/src/CMakeLists.txt

@@ -63,8 +63,8 @@ target_include_directories(MetaCling PRIVATE
    ${CMAKE_SOURCE_DIR}/core/foundation/res
    ${CMAKE_SOURCE_DIR}/core/meta/inc
    ${CMAKE_SOURCE_DIR}/core/metacling/res
-   ${CMAKE_SOURCE_DIR}/core/thread/inc
-   ${CMAKE_SOURCE_DIR}/core/zip/inc
+   ${CMAKE_SOURCE_DIR}/core/parallel/thread/inc
+   ${CMAKE_SOURCE_DIR}/core/compression/zip/inc
    ${CMAKE_SOURCE_DIR}/io/io/inc
    ${CMAKE_BINARY_DIR}/ginclude
 )
@@ -76,7 +76,7 @@ set_target_properties(MetaCling PROPERTIES
 
 if(MSVC)
    target_include_directories(MetaCling PRIVATE
-      ${CMAKE_SOURCE_DIR}/core/winnt/inc
+      ${CMAKE_SOURCE_DIR}/core/os/winnt/inc
    )
    set_source_files_properties(TCling.cxx COMPILE_FLAGS /bigobj)
 endif()

core/os/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory(macosx)
+add_subdirectory(unix)
+add_subdirectory(winnt)

core/macosx/CMakeLists.txt → core/os/macosx/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/macosx package
+# CMakeLists.txt file for building ROOT core/os/macosx package
 ############################################################################
 
 if(NOT APPLE)

core/unix/CMakeLists.txt → core/os/unix/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/unix package
+# CMakeLists.txt file for building ROOT core/os/unix package
 ############################################################################
 
 if(NOT UNIX)

core/winnt/CMakeLists.txt → core/os/winnt/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/winnt package
+# CMakeLists.txt file for building ROOT core/os/winnt package
 ############################################################################
 
 if(NOT WIN32)

core/parallel/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory(imt)
+add_subdirectory(multiproc)
+add_subdirectory(thread)

core/imt/CMakeLists.txt → core/parallel/imt/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/imt package
+# CMakeLists.txt file for building ROOT core/parallel/imt package
 ############################################################################
 
 if(NOT WIN32)

core/multiproc/CMakeLists.txt → core/parallel/multiproc/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/multiproc package
+# CMakeLists.txt file for building ROOT core/parallel/multiproc package
 ############################################################################
 
 if(WIN32)

core/thread/CMakeLists.txt → core/parallel/thread/CMakeLists.txt

@@ -5,7 +5,7 @@
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
 ############################################################################
-# CMakeLists.txt file for building ROOT core/thread package
+# CMakeLists.txt file for building ROOT core/parallel/thread package
 ############################################################################
 
 if(WIN32)
@@ -91,7 +91,7 @@ if(WIN32)
     src/TWin32Thread.cxx
     src/TWin32ThreadFactory.cxx
   )
-  target_include_directories(Thread PRIVATE ${CMAKE_SOURCE_DIR}/core/winnt/inc)
+  target_include_directories(Thread PRIVATE ${CMAKE_SOURCE_DIR}/core/os/winnt/inc)
 else()
   target_sources(Thread PRIVATE
     src/TPosixCondition.cxx

documentation/doxygen/makeinput.sh

@@ -18,18 +18,18 @@ echo "        ../../core/dictgen/              \\" >> Doxyfile_INPUT
 echo "        ../../core/cont/                 \\" >> Doxyfile_INPUT
 echo "        ../../core/foundation/           \\" >> Doxyfile_INPUT
 echo "        ../../core/gui/                  \\" >> Doxyfile_INPUT
-echo "        ../../core/macosx/               \\" >> Doxyfile_INPUT
+echo "        ../../core/os/macosx/            \\" >> Doxyfile_INPUT
 echo "        ../../core/meta/                 \\" >> Doxyfile_INPUT
 echo "        ../../core/metacling/            \\" >> Doxyfile_INPUT
 echo "        ../../core/clingutils/           \\" >> Doxyfile_INPUT
-echo "        ../../core/multiproc/            \\" >> Doxyfile_INPUT
+echo "        ../../core/parallel/multiproc/   \\" >> Doxyfile_INPUT
 echo "        ../../core/rint/                 \\" >> Doxyfile_INPUT
 echo "        ../../core/testsupport/          \\" >> Doxyfile_INPUT
-echo "        ../../core/thread/               \\" >> Doxyfile_INPUT
-echo "        ../../core/unix/                 \\" >> Doxyfile_INPUT
-echo "        ../../core/winnt/                \\" >> Doxyfile_INPUT
-echo "        ../../core/imt/                  \\" >> Doxyfile_INPUT
-echo "        ../../core/zip/inc/Compression.h \\" >> Doxyfile_INPUT
+echo "        ../../core/parallel/thread/      \\" >> Doxyfile_INPUT
+echo "        ../../core/os/unix/              \\" >> Doxyfile_INPUT
+echo "        ../../core/os/winnt/             \\" >> Doxyfile_INPUT
+echo "        ../../core/parallel/imt/         \\" >> Doxyfile_INPUT
+echo "        ../../core/compression/zip/inc/Compression.h \\" >> Doxyfile_INPUT
 echo "        ../../geom/                      \\" >> Doxyfile_INPUT
 echo "        ../../graf2d/asimage/            \\" >> Doxyfile_INPUT
 echo "        ../../graf2d/cocoa/              \\" >> Doxyfile_INPUT
@@ -77,7 +77,7 @@ echo "        ../../bindings/pyroot/pythonizations/python/ROOT/_pythonization/__
 echo "        ../../bindings/r/                \\" >> Doxyfile_INPUT
 
 # echo "        ../../core/clib/                 \\" >> Doxyfile_INPUT
-# echo "        ../../core/lzma/                 \\" >> Doxyfile_INPUT
+# echo "        ../../core/compression/lzma/     \\" >> Doxyfile_INPUT
 # echo "        ../../core/newdelete/            \\" >> Doxyfile_INPUT
 # echo "        ../../core/textinput/            \\" >> Doxyfile_INPUT
 # echo "        ../../graf2d/mathtext/           \\" >> Doxyfile_INPUT

io/rootpcm/CMakeLists.txt

@@ -12,5 +12,5 @@ ROOT_OBJECT_LIBRARY(RootPcmObjs src/rootclingIO.cxx)
 
 target_include_directories(RootPcmObjs PRIVATE
    ${CMAKE_SOURCE_DIR}/io/io/inc
-   ${CMAKE_SOURCE_DIR}/core/zip/inc
+   ${CMAKE_SOURCE_DIR}/core/compression/zip/inc
 )

tree/readspeed/CMakeLists.txt

@@ -18,7 +18,7 @@ target_include_directories(ReadSpeed PRIVATE
   ${CMAKE_SOURCE_DIR}/io/io/inc
   ${CMAKE_SOURCE_DIR}/tree/tree/inc
   ${CMAKE_SOURCE_DIR}/tree/treeplayer/inc
-  ${CMAKE_SOURCE_DIR}/core/imt/inc
+  ${CMAKE_SOURCE_DIR}/core/parallel/imt/inc
 )
 
 ROOT_ADD_TEST_SUBDIRECTORY(test)