Cleaned up shared lib install

Author: wsobel

CMakeLists.txt

@@ -99,14 +99,22 @@ endif()
 # We will set this to the agent_test project.
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT agent)
 
-install(FILES README.md LICENSE.TXT TYPE DATA)
-install(DIRECTORY schemas TYPE DATA)
-install(DIRECTORY simulator TYPE DATA)
-install(DIRECTORY styles TYPE DATA)
-install(DIRECTORY tools TYPE DATA)
-install(DIRECTORY demo TYPE DATA)
-install(FILES demo/agent/Devices.xml TYPE SYSCONF)
-
+install(FILES README.md LICENSE.TXT TYPE DATA COMPONENT Required)
+install(DIRECTORY schemas TYPE DATA  COMPONENT Data)
+install(DIRECTORY simulator TYPE DATA  COMPONENT Tools)
+install(DIRECTORY styles TYPE DATA  COMPONENT Data)
+install(DIRECTORY tools TYPE DATA COMPONENT Tools)
+install(DIRECTORY demo TYPE DATA COMPONENT Demo)
+install(FILES demo/agent/Devices.xml TYPE SYSCONF COMPONENT Demo)
+
+set(CPACK_COMPONENT_Demo_DESCRIPTION "Demo files for the Mazak and Okuma digital twin")
+set(CPACK_COMPONENT_Data_DESCRIPTION "Data files for schemas and styles to be served by the agent")
+set(CPACK_COMPONENT_Tools_DESCRIPTION "Scripts for to support running and simulating adapter behavior")
+set(CPACK_COMPONENT_Required_DESCRIPTION "Requied distribution files")
+set(CPACK_COMPONENT_Development_DESCRIPTION "Supporting files for developing using the agent library")
+set(CPACK_COMPONENT_Runtime_DESCRIPTION "Files required for running of the agent")
+
+set(CPACK_COMPONENT_Required_REQUIRED 1)
 set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
 set(CPACK_PACKAGE_VERSION "${AGENT_VERSION_MAJOR}.${AGENT_VERSION_MINOR}.${AGENT_VERSION_PATCH}.${AGENT_VERSION_BUILD}${AGENT_VERSION_RC}")
 set(CPACK_PACKAGE_VERSION_MAJOR ${AGENT_VERSION_MAJOR})

Dockerfile

@@ -74,9 +74,11 @@ COPY . .
 
 ARG WITH_TESTS=false
 ARG WITH_TESTS_ARG=argument
+ARG SHARED=False
 
 # Build and optionally test
-RUN if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; \
+RUN set -x \
+   && if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; \
       then WITH_TESTS_ARG="--test-folder="; \
       else WITH_TESTS_ARG=""; fi \
    && conan profile detect \
@@ -89,6 +91,7 @@ RUN if [ -z "$WITH_TESTS" ] || [ "$WITH_TESTS" = "false" ]; \
      -o cpack_destination=/root/agent \
      -o cpack_name=dist \
      -o cpack_generator=TGZ \
+     -o shared=${SHARED} \
      -pr "$CONAN_PROFILE" \
      ${WITH_TESTS_ARG}
 
@@ -102,6 +105,7 @@ FROM os AS release
 LABEL author='mtconnect' description='MTConnect C++ Agent'
 
 ARG BIN_DIR='/usr/local/bin'
+ARG LIB_DIR='/usr/local/lib'
 
 ARG MTCONNECT_CONF_DIR='/etc/mtconnect'
 ARG MTCONNECT_DATA_DIR='/usr/local/share/mtconnect'
@@ -131,7 +135,11 @@ RUN tar xf dist.tar.gz
 
 # Copy the agent binary and create folders used by the agent
 USER root
-RUN cp /home/agent/dist/bin/* "$BIN_DIR" \
+RUN set +x \
+    && ls -lR /home/agent/dist/ \
+    && mkdir -p "$BIN_DIR" "$LIB_DIR" \
+    && cp /home/agent/dist/bin/* "$BIN_DIR" \
+    && cp /home/agent/dist/lib/* "$LIB_DIR" \
     && mkdir -p "$MTCONNECT_CONF_DIR" \
                 "$MTCONNECT_DATA_DIR" \
                 "$MTCONNECT_LOG_DIR" \

agent/CMakeLists.txt

@@ -43,15 +43,17 @@ target_link_libraries(
 
 target_clangtidy_setup(agent)
 
-install(TARGETS agent RUNTIME)
-install(TARGETS agent ARCHIVE)
 
 if(SHARED_AGENT_LIB AND MSVC)
   set(CMAKE_INSTALL_DEBUG_LIBRARIES OFF)
   include(InstallRequiredSystemLibraries)
   install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION bin COMPONENT Libraries)
-  file(GLOB dlls CONFIGURE_DEPENDS "${cppagent_BINARY_DIR}/dlls/*.dll")
+  
+  file(GLOB dlls CONFIGURE_DEPENDS "${cppagent_BINARY_DIR}/libs/*.dll")
+  file(GLOB libs CONFIGURE_DEPENDS "${cppagent_BINARY_DIR}/libs/*.lib")
+  
   install(FILES ${dlls} DESTINATION bin COMPONENT Libraries)
+  install(FILES ${libs} DESTINATION lib COMPONENT Development)
 
   add_custom_command(TARGET agent POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${dlls} $<TARGET_FILE_DIR:agent>
@@ -60,7 +62,17 @@ if(SHARED_AGENT_LIB AND MSVC)
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:agent> $<TARGET_FILE_DIR:agent> 
     COMMAND_EXPAND_LISTS)
 elseif(SHARED_AGENT_LIB)
-  file(GLOB dlls CONFIGURE_DEPENDS "${cppagent_BINARY_DIR}/dlls/*.dylib" "${cppagent_BINARY_DIR}/dlls/*.so")
-  message(STATUS "!!!!! Copying ${dlls} to lib directory")
-  install(FILES ${dlls} TYPE LIB COMPONENT Libraries)
+  file(GLOB SharedLibs CONFIGURE_DEPENDS
+    "${cppagent_BINARY_DIR}/libs/*.dylib"
+    "${cppagent_BINARY_DIR}/libs/*.so.*"
+    "${cppagent_BINARY_DIR}/libs/*.so")
+
+  message(STATUS "Will install shared libs ${SharedLibs} in lib directory")
+  install(FILES ${SharedLibs} TYPE LIB COMPONENT Runtime)
 endif()
+
+# Uncomment the next two lines to distribute *NIX archives
+# file(GLOB Archives CONFIGURE_DEPENDS "${cppagent_BINARY_DIR}/libs/*.a")
+# install(FILES ${Archives} TYPE LIB COMPONENT Developement)
+
+Install(TARGETS agent RUNTIME COMPONENT Runtime)

agent_lib/CMakeLists.txt

@@ -438,8 +438,7 @@ target_sources(agent_lib PUBLIC FILE_SET headers
   TYPE HEADERS
   BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../src/" "${PROJECT_BINARY_DIR}/agent_lib/"
   FILES "${AGENT_LIB_HEADERS}" "${PROJECT_BINARY_DIR}/agent_lib/mtconnect/version.h")
-  
 
-install(TARGETS agent_lib LIBRARY)
-install(TARGETS agent_lib ARCHIVE)
-install(TARGETS agent_lib FILE_SET headers PUBLIC_HEADER)
+install(TARGETS agent_lib ARCHIVE COMPONENT Development)
+install(TARGETS agent_lib FILE_SET headers PUBLIC_HEADER COMPONENT Development)
+install(TARGETS agent_lib LIBRARY COMPONENT Runtime)

conanfile.py

@@ -149,12 +149,13 @@ def generate(self):
             for dep in self.dependencies.values():
                 if dep.cpp_info.bindirs:
                     if is_msvc(self) and dep.cpp_info.bindirs:
-                        print("Copying from " + dep.cpp_info.bindirs[0] + " to " + os.path.join(self.build_folder, "dlls"))
-                        copy(self, "*.dll", dep.cpp_info.bindirs[0], os.path.join(self.build_folder, "dlls"), keep_path=False)
+                        print("Copying from " + dep.cpp_info.bindirs[0] + " to " + os.path.join(self.build_folder, "libs"))
+                        copy(self, "*.dll", dep.cpp_info.bindirs[0], os.path.join(self.build_folder, "libs"), keep_path=False)
                     elif dep.cpp_info.libdirs:
-                        print("Copying from " + dep.cpp_info.libdirs[0] + " to " + os.path.join(self.build_folder, "dlls"))                        
-                        copy(self, "*.so*", dep.cpp_info.libdirs[0], os.path.join(self.build_folder, "dlls"), keep_path=False)
-                        copy(self, "*.dylib", dep.cpp_info.libdirs[0], os.path.join(self.build_folder, "dlls"), keep_path=False)            
+                        print("Copying from " + dep.cpp_info.libdirs[0] + " to " + os.path.join(self.build_folder, "libs"))
+                        # copy(self, "*.a", dep.cpp_info.libdirs[0], os.path.join(self.build_folder, "libs"), keep_path=False)
+                        copy(self, "*.so*", dep.cpp_info.libdirs[0], os.path.join(self.build_folder, "libs"), keep_path=False)
+                        copy(self, "*.dylib", dep.cpp_info.libdirs[0], os.path.join(self.build_folder, "libs"), keep_path=False)            
 
         tc = CMakeToolchain(self)