refact: add directory common

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

src/CMakeLists.txt

@@ -26,9 +26,11 @@ endif()
 list(REMOVE_DUPLICATES CHECKED_INCLUDE_DIRS)
 
 add_subdirectory(utils)
+add_subdirectory(common)
 
 set(SHARED_INCS
 	${CMAKE_CURRENT_SOURCE_DIR}
+	${COMMON_INCS}
 	${UTILS_INCS}
 	${CMAKE_BINARY_DIR}/conf
 	${CHECKED_INCLUDE_DIRS}

src/common/CMakeLists.txt

+# get current directory sources files
+
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} common_top_srcs)
+
+set(local_common_srcs
+    ${common_top_srcs}
+    )
+
+set(local_common_incs
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+set(COMMON_SRCS
+    ${local_common_srcs}
+    PARENT_SCOPE
+    )
+set(COMMON_INCS
+    ${local_common_incs}
+    PARENT_SCOPE
+    )
+
+

src/utils/http/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 add_library(libhttpclient ${LIBTYPE} ${http_client_srcs})
 
 target_include_directories(libhttpclient PUBLIC 
-    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src/common
     ${CMAKE_SOURCE_DIR}/src/utils
     ${CMAKE_SOURCE_DIR}/src/utils/cutils
     ${CMAKE_SOURCE_DIR}/src/utils/http

test/cmd/isula/extend/pause/CMakeLists.txt

@@ -30,7 +30,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/client
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/sha256
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils

test/cmd/isula/extend/resume/CMakeLists.txt

@@ -30,7 +30,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/client
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/sha256

test/cmd/isula/infomation/info/CMakeLists.txt

@@ -31,7 +31,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/client
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/sha256

test/cmd/isula/infomation/ps/CMakeLists.txt

@@ -30,7 +30,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/client
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/json

test/cutils/utils_array/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/sha256
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils

test/cutils/utils_convert/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/sha256
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils

test/cutils/utils_string/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/sha256
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils

test/image/oci/oci_config_merge/CMakeLists.txt

@@ -35,7 +35,7 @@ target_include_directories(${EXE} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/image/oci
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/utils/cutils
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/runtime/engines

test/image/oci/storage/images/CMakeLists.txt

@@ -28,7 +28,7 @@ target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
     ${CMAKE_BINARY_DIR}/conf
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/tar
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/map

test/image/oci/storage/layers/CMakeLists.txt

@@ -33,7 +33,7 @@ add_executable(${DRIVER_EXE}
 target_include_directories(${DRIVER_EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/tar
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/map
@@ -129,4 +129,4 @@ target_link_libraries(${EXE}
     ${GMOCK_MAIN_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
     -lwebsockets -lcrypto -lyajl -larchive -ldevmapper -lz)
-]]
\ No newline at end of file
+]]

test/image/oci/storage/rootfs/CMakeLists.txt

@@ -26,7 +26,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/tar
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/map

test/path/CMakeLists.txt

@@ -18,7 +18,7 @@ add_executable(${EXE}
 
 target_include_directories(${EXE} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/cutils
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/sha256

test/runtime/isula/CMakeLists.txt

@@ -32,7 +32,7 @@ target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/services/execution/manager
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/events

test/runtime/lcr/CMakeLists.txt

@@ -32,7 +32,7 @@ target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/container

test/services/execution/execute/execution_extend/CMakeLists.txt

@@ -47,7 +47,7 @@ add_executable(${EXE}
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/runtime
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd/isulad

test/services/execution/spec/CMakeLists.txt

@@ -41,7 +41,7 @@ add_executable(${MOCK_EXE}
 
 target_include_directories(${EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/utils/cutils
@@ -55,7 +55,7 @@ target_include_directories(${EXE} PUBLIC
 
 target_include_directories(${MOCK_EXE} PUBLIC
     ${GTEST_INCLUDE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/utils/cutils

test/specs/specs/CMakeLists.txt

@@ -38,7 +38,7 @@ target_include_directories(${EXE} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/image/oci
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/image
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon

test/specs/specs_extend/CMakeLists.txt

@@ -38,7 +38,7 @@ target_include_directories(${EXE} PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/image/oci
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/image
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon