From 8557ab52c965a1cfef983e1c968c4d8232e02e17 Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 15 May 2020 22:26:31 +0200 Subject: [PATCH 1/5] Add tao as feature for ace --- ports/ace/CONTROL | 7 + ports/ace/portfile.cmake | 453 ++++++++++++++++++++++++++++++--------- 2 files changed, 363 insertions(+), 97 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index eedac8bf818469..647e2b8aec70ac 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -13,3 +13,10 @@ Build-Depends: openssl Feature: xml Description: Enable XML features in ACE + +Feature: zlib +Build-Depends: zlib +Description: Enable zlib support + +Feature: tao +Description: The ACE ORB diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index d2ced1cad1162d..e3bce15ac9d9cb 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -3,20 +3,38 @@ vcpkg_fail_port_install(ON_TARGET "uwp") # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -if(VCPKG_TARGET_IS_WINDOWS) - # Don't change to vcpkg_from_github! This points to a release and not an archive - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.zip" - FILENAME ACE-src-6.5.9.zip - SHA512 49e2e5f9d0a88ae1b8a75aacb962e4185a9f8c8aae6cde656026267524bcef8a673514fe35709896a1c4e356cb436b249ff5e3d487e8f3fa2e618e2fb813fa43 - ) -else(VCPKG_TARGET_IS_WINDOWS) - # VCPKG_TARGET_IS_LINUX - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.tar.gz" - FILENAME ACE-src-6.5.9.tar.gz - SHA512 3e1655d4b215b5195a29b22f2e43d985d68367294df98da251dbbedecd6bdb5662a9921faac43be5756cb2fca7a840d58c6ec92637da7fb9d1b5e2bca766a1b4 - ) +if("tao" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS) + # Don't change to vcpkg_from_github! This points to a release and not an archive + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE%2BTAO-src-6.5.9.zip" + FILENAME ACE-TAO-6.5.9.zip + SHA512 de626d693911ea6b43001b16183996bd537777b42530a95ef226265948802b87aaac935d92265f1dda39c864a875d669a10cdcb0083e3dc7c3f5f661a5ee9d79 + ) + else() + # VCPKG_TARGET_IS_LINUX + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE%2BTAO-src-6.5.9.tar.gz" + FILENAME ACE-TAO-6.5.9.tar.gz + SHA512 d53b7a3745d1be29489d495651a643cf8b436be97a21599bbe4fba19b827cb1ba85dca82542e0eb27384fe87ab163e69c5e0c4c9b61a4c7971077b13edece5cd + ) + endif() +else() + if(VCPKG_TARGET_IS_WINDOWS) + # Don't change to vcpkg_from_github! This points to a release and not an archive + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.zip" + FILENAME ACE-src-6.5.9.zip + SHA512 49e2e5f9d0a88ae1b8a75aacb962e4185a9f8c8aae6cde656026267524bcef8a673514fe35709896a1c4e356cb436b249ff5e3d487e8f3fa2e618e2fb813fa43 + ) + else(VCPKG_TARGET_IS_WINDOWS) + # VCPKG_TARGET_IS_LINUX + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_9/ACE-src-6.5.9.tar.gz" + FILENAME ACE-src-6.5.9.tar.gz + SHA512 3e1655d4b215b5195a29b22f2e43d985d68367294df98da251dbbedecd6bdb5662a9921faac43be5756cb2fca7a840d58c6ec92637da7fb9d1b5e2bca766a1b4 + ) + endif() endif() vcpkg_extract_source_archive_ex( @@ -27,27 +45,32 @@ vcpkg_extract_source_archive_ex( set(ACE_ROOT ${SOURCE_PATH}) set(ENV{ACE_ROOT} ${ACE_ROOT}) set(ACE_SOURCE_PATH ${ACE_ROOT}/ace) - +if("tao" IN_LIST FEATURES) + set(TAO_ROOT ${SOURCE_PATH}/TAO) + set(ENV{TAO_ROOT} ${TAO_ROOT}) + set(WORKSPACE ${TAO_ROOT}/TAO_ACE) +else() + set(WORKSPACE ${ACE_ROOT}/ace/ace) +endif() if("wchar" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "uses_wchar=1") endif() if("zlib" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "zlib=1") + set(ENV{ZLIB_ROOT} ${CURRENT_INSTALLED_DIR}) else() list(APPEND ACE_FEATURE_LIST "zlib=0") endif() if("ssl" IN_LIST FEATURES) list(APPEND ACE_FEATURE_LIST "ssl=1") list(APPEND ACE_FEATURE_LIST "openssl11=1") + set(ENV{SSL_ROOT} ${CURRENT_INSTALLED_DIR}) else() list(APPEND ACE_FEATURE_LIST "ssl=0") endif() list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(DLL_DECORATOR s) - endif() set(MPC_STATIC_FLAG -static) endif() @@ -65,10 +88,6 @@ endif() # Add ace/config.h file # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html if(VCPKG_TARGET_IS_WINDOWS) - set(DLL_RELEASE_SUFFIX .dll) - set(DLL_DEBUG_SUFFIX d.dll) - set(LIB_RELEASE_SUFFIX .lib) - set(LIB_DEBUG_SUFFIX d.lib) if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") set(SOLUTION_TYPE vs2019) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") @@ -78,21 +97,10 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") elseif(VCPKG_TARGET_IS_LINUX) - set(DLL_DECORATOR) - set(DLL_RELEASE_SUFFIX .so) - set(DLL_DEBUG_SUFFIX .so) - set(LIB_RELEASE_SUFFIX .a) - set(LIB_DEBUG_SUFFIX .a) - set(LIB_PREFIX lib) set(SOLUTION_TYPE gnuace) file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"") file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU") elseif(VCPKG_TARGET_IS_OSX) - set(DLL_DECORATOR) - set(DLL_RELEASE_SUFFIX .dylib) - set(DLL_DEBUG_SUFFIX .dylib) - set(LIB_RELEASE_SUFFIX .a) - set(LIB_DEBUG_SUFFIX .a) set(SOLUTION_TYPE gnuace) file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"") file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU") @@ -100,14 +108,14 @@ endif() # Invoke mwc.pl to generate the necessary solution and project files vcpkg_execute_build_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG} + COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} WORKING_DIRECTORY ${ACE_ROOT} LOGNAME mwc-${TARGET_TRIPLET} ) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_build_msbuild( - PROJECT_PATH ${ACE_SOURCE_PATH}/ace.sln + PROJECT_PATH ${WORKSPACE}.sln PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION ) @@ -116,68 +124,316 @@ if(VCPKG_TARGET_IS_WINDOWS) # headers are public and which not. For the moment we install everything # that is in the source path and ends in .h, .inl function(install_ace_headers_subdirectory ORIGINAL_PATH RELATIVE_PATH) - file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl) - file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH}) + file(GLOB HEADER_FILES + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl + ) + file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) endfunction() - # We manually install header found in the ace directory because in that case - # we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file - file(GLOB HEADER_FILES ${ACE_SOURCE_PATH}/*.h ${ACE_SOURCE_PATH}/*.inl ${ACE_SOURCE_PATH}/*.cpp) - file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/) + # We manually install cpp files found in the ace directory + # see ACE_wrappers\debian\libace-dev.install file + file(GLOB ACE_SOURCE_FILES ${ACE_SOURCE_PATH}/*.cpp) + file(INSTALL ${ACE_SOURCE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/) # Install headers in subdirectory - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression/rle") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "ETCL") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "QoS") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Monitor_Control") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/arpa") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/net") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/netinet") - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/sys") + install_ace_headers_subdirectory(${ACE_ROOT} "ace") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/Compression") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/Compression/rle") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/ETCL") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/QoS") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/Monitor_Control") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/arpa") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/net") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/netinet") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/sys") if("ssl" IN_LIST FEATURES) - install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL") + install_ace_headers_subdirectory(${ACE_ROOT} "ace/SSL") endif() - + if("tao" IN_LIST FEATURES) + install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML") + install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/apps") + install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/apps/svcconf") + install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/common") + install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/parser") + install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/parser/parser") + install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/HTBP") + install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/INet") + install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/RMCast") + install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/TMCast") + install_ace_headers_subdirectory(${ACE_ROOT} "Kokyu") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/AV") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Concurrency") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/CosEvent") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Event") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FaultTolerance") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FtRtEvent/ClientORB") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FtRtEvent/EventChannel") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FtRtEvent/Utils") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/HTIOP") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/IFRService") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/LifeCycle") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/LoadBalancing") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Log") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Naming") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Naming/FaultTolerant") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/Any") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/MonitorControl") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/MonitorControlExt") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/Sequence") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/Structured") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/PortableGroup") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Property") + install_ace_headers_subdirectory(${TAO_ROOT} "orbsvcs/FT_ReplicationManager") + install_ace_headers_subdirectory(${TAO_ROOT} "orbsvcs/Notify_Service") + if("ssl" IN_LIST FEATURES) + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/SSLIOP") + endif() + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Sched") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Security") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Time") + install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Trader") + install_ace_headers_subdirectory(${TAO_ROOT} "tao") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/AnyTypeCode") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/BiDir_GIOP") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/CSD_Framework") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/CSD_ThreadPool") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/CodecFactory") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Codeset") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Compression") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Compression/rle") + if("zlib" IN_LIST FEATURES) + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Compression/zlib") + endif() + install_ace_headers_subdirectory(${TAO_ROOT} "tao/DiffServPolicy") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/DynamicAny") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/DynamicInterface") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Dynamic_TP") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/ETCL") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/EndpointPolicy") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/IFR_Client") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/IORInterceptor") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/IORManipulation") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/IORTable") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/ImR_Client") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Messaging") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Monitor") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/ObjRefTemplate") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/PI") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/PI_Server") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/PortableServer") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/RTCORBA") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/RTPortableServer") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/RTScheduling") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/SmartProxies") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Strategies") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/TransportCurrent") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/TypeCodeFactory") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Utils") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/Valuetype") + install_ace_headers_subdirectory(${TAO_ROOT} "tao/ZIOP") + endif() + # Install the libraries - function(install_ace_library ORIGINAL_PATH ACE_LIBRARY) - set(LIB_PATH ${ORIGINAL_PATH}/lib/) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - # Install the DLL files - file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}${DLL_DEBUG_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}${DLL_RELEASE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if(NOT VCPKG_CMAKE_SYSTEM_NAME) + set(DLL_DECORATOR s) + endif() endif() - # Install the lib files - file(INSTALL - ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) + function(install_ace_library ACE_LIBRARY) + set(LIB_PATH ${ACE_ROOT}/lib/) + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + # Install the DLL files + file(INSTALL + ${LIB_PATH}/${ACE_LIBRARY}d.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + ) + file(INSTALL + ${LIB_PATH}/${ACE_LIBRARY}.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + ) + endif() - file(INSTALL - ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) + # Install the lib files + file(INSTALL + ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}d.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + ) + + file(INSTALL + ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + ) endfunction() - install_ace_library(${ACE_ROOT} "ACE") - install_ace_library(${ACE_ROOT} "ACE_Compression") - install_ace_library(${ACE_ROOT} "ACE_ETCL") - install_ace_library(${ACE_ROOT} "ACE_ETCL_Parser") - install_ace_library(${ACE_ROOT} "ACE_Monitor_Control") + install_ace_library("ACE") + install_ace_library("ACE_Compression") + install_ace_library("ACE_ETCL") + install_ace_library("ACE_ETCL_Parser") + install_ace_library("ACE_Monitor_Control") + install_ace_library("ACE_RLECompression") if(NOT VCPKG_CMAKE_SYSTEM_NAME) - install_ace_library(${ACE_ROOT} "ACE_QoS") + install_ace_library("ACE_QoS") endif() - install_ace_library(${ACE_ROOT} "ACE_RLECompression") if("ssl" IN_LIST FEATURES) - install_ace_library(${ACE_ROOT} "ACE_SSL") + install_ace_library("ACE_SSL") + endif() + if("tao" IN_LIST FEATURES) + install_ace_library("ACE_HTBP") + install_ace_library("ACE_INet") + install_ace_library("ACE_RMCast") + install_ace_library("ACE_TMCast") + install_ace_library("ACEXML") + install_ace_library("ACEXML_Parser") + install_ace_library("Kokyu") + install_ace_library("TAO") + install_ace_library("TAO_AnyTypeCode") + install_ace_library("TAO_Async_ImR_Client_IDL") + install_ace_library("TAO_Async_IORTable") + install_ace_library("TAO_AV") + install_ace_library("TAO_BiDirGIOP") + install_ace_library("TAO_Catior_i") + install_ace_library("TAO_CodecFactory") + install_ace_library("TAO_Codeset") + install_ace_library("TAO_Compression") + install_ace_library("TAO_CosConcurrency") + install_ace_library("TAO_CosConcurrency_Serv") + install_ace_library("TAO_CosConcurrency_Skel") + install_ace_library("TAO_CosEvent") + install_ace_library("TAO_CosEvent_Serv") + install_ace_library("TAO_CosEvent_Skel") + install_ace_library("TAO_CosLifeCycle") + install_ace_library("TAO_CosLifeCycle_Skel") + install_ace_library("TAO_CosLoadBalancing") + install_ace_library("TAO_CosNaming") + install_ace_library("TAO_CosNaming_Serv") + install_ace_library("TAO_CosNaming_Skel") + install_ace_library("TAO_CosNotification") + install_ace_library("TAO_CosNotification_MC") + install_ace_library("TAO_CosNotification_MC_Ext") + install_ace_library("TAO_CosNotification_Persist") + install_ace_library("TAO_CosNotification_Serv") + install_ace_library("TAO_CosNotification_Skel") + install_ace_library("TAO_CosProperty") + install_ace_library("TAO_CosProperty_Serv") + install_ace_library("TAO_CosProperty_Skel") + install_ace_library("TAO_CosTime") + install_ace_library("TAO_CosTime_Serv") + install_ace_library("TAO_CosTime_Skel") + install_ace_library("TAO_CosTrading") + install_ace_library("TAO_CosTrading_Serv") + install_ace_library("TAO_CosTrading_Skel") + install_ace_library("TAO_CSD_Framework") + install_ace_library("TAO_CSD_ThreadPool") + install_ace_library("TAO_DiffServPolicy") + install_ace_library("TAO_DsEventLogAdmin") + install_ace_library("TAO_DsEventLogAdmin_Serv") + install_ace_library("TAO_DsEventLogAdmin_Skel") + install_ace_library("TAO_DsLogAdmin") + install_ace_library("TAO_DsLogAdmin_Serv") + install_ace_library("TAO_DsLogAdmin_Skel") + install_ace_library("TAO_DsNotifyLogAdmin") + install_ace_library("TAO_DsNotifyLogAdmin_Serv") + install_ace_library("TAO_DsNotifyLogAdmin_Skel") + install_ace_library("TAO_Dynamic_TP") + install_ace_library("TAO_DynamicAny") + install_ace_library("TAO_DynamicInterface") + install_ace_library("TAO_EndpointPolicy") + install_ace_library("TAO_ETCL") + install_ace_library("TAO_FaultTolerance") + install_ace_library("TAO_FT_ClientORB") + install_ace_library("TAO_FT_Naming_Serv") + install_ace_library("TAO_FT_ServerORB") + install_ace_library("TAO_FtNaming") + install_ace_library("TAO_FtNamingReplication") + install_ace_library("TAO_FTORB_Utils") + install_ace_library("TAO_FTRT_ClientORB") + install_ace_library("TAO_FTRT_EventChannel") + install_ace_library("TAO_FtRtEvent") + install_ace_library("TAO_HTIOP") + install_ace_library("TAO_IDL_BE") + install_ace_library("TAO_IDL_FE") + install_ace_library("TAO_IFR_BE") + install_ace_library("TAO_IFR_Client") + install_ace_library("TAO_IFR_Client_skel") + install_ace_library("TAO_IFRService") + install_ace_library("TAO_ImR_Activator") + install_ace_library("TAO_ImR_Activator_IDL") + install_ace_library("TAO_ImR_Client") + install_ace_library("TAO_ImR_Locator") + install_ace_library("TAO_ImR_Locator_IDL") + install_ace_library("TAO_IORInterceptor") + install_ace_library("TAO_IORManip") + install_ace_library("TAO_IORTable") + install_ace_library("TAO_Messaging") + install_ace_library("TAO_Monitor") + install_ace_library("TAO_Notify_Service") + install_ace_library("TAO_ObjRefTemplate") + install_ace_library("TAO_PI") + install_ace_library("TAO_PI_Server") + install_ace_library("TAO_PortableGroup") + install_ace_library("TAO_PortableServer") + install_ace_library("TAO_ReplicationManagerLib") + install_ace_library("TAO_RLECompressor") + install_ace_library("TAO_RT_Notification") + install_ace_library("TAO_RTCORBA") + install_ace_library("TAO_RTCORBAEvent") + install_ace_library("TAO_RTEvent") + install_ace_library("TAO_RTEvent_Serv") + install_ace_library("TAO_RTEvent_Skel") + install_ace_library("TAO_RTEventLogAdmin") + install_ace_library("TAO_RTEventLogAdmin_Serv") + install_ace_library("TAO_RTEventLogAdmin_Skel") + install_ace_library("TAO_RTKokyuEvent") + install_ace_library("TAO_RTPortableServer") + install_ace_library("TAO_RTSched") + install_ace_library("TAO_RTSchedEvent") + install_ace_library("TAO_RTScheduler") + install_ace_library("TAO_Security") + install_ace_library("TAO_SmartProxies") + install_ace_library("TAO_Strategies") + install_ace_library("TAO_Svc_Utils") + install_ace_library("TAO_TC") + install_ace_library("TAO_TC_IIOP") + install_ace_library("TAO_TypeCodeFactory") + install_ace_library("TAO_Utils") + install_ace_library("TAO_Valuetype") + install_ace_library("TAO_ZIOP") + if("ssl" IN_LIST FEATURES) + install_ace_library("ACE_INet_SSL") + install_ace_library("TAO_SSLIOP") + endif() + if("zlib" IN_LIST FEATURES) + install_ace_library("TAO_ZlibCompressor") + endif() + endif() + + # Install the executables + function(install_ace_executable ACE_EXECUTABLE) + set(BIN_PATH ${ACE_ROOT}/bin/) + file(INSTALL + ${BIN_PATH}/${ACE_EXECUTABLE}.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} + ) + endfunction() + + if("tao" IN_LIST FEATURES) + install_ace_executable("ace_gperf") + install_ace_executable("tao_catior") + install_ace_executable("tao_idl") + install_ace_executable("tao_ifr") + install_ace_executable("tao_imr") + install_ace_executable("tao_nsadd") + install_ace_executable("tao_nsdel") + install_ace_executable("tao_nsgroup") + install_ace_executable("tao_nslist") endif() vcpkg_copy_pdbs() @@ -191,60 +447,63 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) MESSAGE(FATAL_ERROR "MAKE not found") ENDIF () - list(APPEND _pkg_components ACE_ETCL_Parser ACE_ETCL ACE) if("ssl" IN_LIST FEATURES) list(APPEND _ace_makefile_macros "ssl=1") - set(ENV{SSL_ROOT} ${CURRENT_INSTALLED_DIR}) - list(APPEND _pkg_components ACE_SSL) endif() + set(ENV{INSTALL_PREFIX} ${CURRENT_PACKAGES_DIR}) # Set `PWD` environment variable since ACE's `install` make target calculates install dir using this env. set(_prev_env $ENV{PWD}) - set(ENV{PWD} ${ACE_ROOT}/ace) + get_filename_component(WORKING_DIR ${WORKSPACE} DIRECTORY) + set(ENV{PWD} ${WORKING_DIR}) message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( - COMMAND make ${_ace_makefile_macros} "debug=1" "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${ACE_ROOT}/ace + COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET}-dbg ) message(STATUS "Building ${TARGET_TRIPLET}-dbg done") message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${ACE_ROOT}/ace + WORKING_DIRECTORY ${WORKING_DIR} LOGNAME install-${TARGET_TRIPLET}-dbg ) + file(COPY ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) - # TODO: check if we really need to remove those directories - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) + + file(GLOB _pkg_components ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc) foreach(_pkg_comp ${_pkg_components}) - file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_pkg_comp}.pc _content) + file(READ ${_pkg_comp} _content) string(REPLACE "libdir=${CURRENT_PACKAGES_DIR}/lib" "libdir=${CURRENT_PACKAGES_DIR}/debug/lib" _content ${_content}) - file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${_pkg_comp}.pc ${_content}) + file(WRITE ${_pkg_comp} ${_content}) endforeach() message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} realclean - WORKING_DIRECTORY ${ACE_ROOT}/ace + WORKING_DIRECTORY ${WORKING_DIR} LOGNAME realclean-${TARGET_TRIPLET}-dbg ) message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY ${ACE_ROOT}/ace + WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET}-rel ) message(STATUS "Building ${TARGET_TRIPLET}-rel done") message(STATUS "Packaging ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY ${ACE_ROOT}/ace + WORKING_DIRECTORY ${WORKING_DIR} LOGNAME install-${TARGET_TRIPLET}-rel ) + if("tao" IN_LIST FEATURES) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + endif() message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") # Restore `PWD` environment variable set($ENV{PWD} _prev_env) From 432dbba29c513a3953b5c8825cc530cafb668c7c Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 20 May 2020 14:20:30 +0200 Subject: [PATCH 2/5] Use vcpkg_install_msbuild instead of vcpkg_build_msbuild --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 214 +++------------------------------------ 2 files changed, 14 insertions(+), 202 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 647e2b8aec70ac..7f2d44c4f1b1ef 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 6.5.9 +Version: 6.5.9-3 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment Supports: !uwp diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index e3bce15ac9d9cb..33b23e7a1afb98 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -114,12 +114,15 @@ vcpkg_execute_build_process( ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_build_msbuild( - PROJECT_PATH ${WORKSPACE}.sln + file(RELATIVE_PATH PROJECT_SUBPATH ${SOURCE_PATH} ${WORKSPACE}.sln) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ${PROJECT_SUBPATH} + LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION ) - + # ACE itself does not define an install target, so it is not clear which # headers are public and which not. For the moment we install everything # that is in the source path and ends in .h, .inl @@ -240,207 +243,16 @@ if(VCPKG_TARGET_IS_WINDOWS) install_ace_headers_subdirectory(${TAO_ROOT} "tao/ZIOP") endif() - # Install the libraries - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(DLL_DECORATOR s) - endif() - endif() - - function(install_ace_library ACE_LIBRARY) - set(LIB_PATH ${ACE_ROOT}/lib/) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - # Install the DLL files - file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}d.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${LIB_PATH}/${ACE_LIBRARY}.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - endif() - - # Install the lib files - file(INSTALL - ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}d.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) - - file(INSTALL - ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - endfunction() - - install_ace_library("ACE") - install_ace_library("ACE_Compression") - install_ace_library("ACE_ETCL") - install_ace_library("ACE_ETCL_Parser") - install_ace_library("ACE_Monitor_Control") - install_ace_library("ACE_RLECompression") - if(NOT VCPKG_CMAKE_SYSTEM_NAME) - install_ace_library("ACE_QoS") - endif() - if("ssl" IN_LIST FEATURES) - install_ace_library("ACE_SSL") - endif() + # Remove dlls without any export if("tao" IN_LIST FEATURES) - install_ace_library("ACE_HTBP") - install_ace_library("ACE_INet") - install_ace_library("ACE_RMCast") - install_ace_library("ACE_TMCast") - install_ace_library("ACEXML") - install_ace_library("ACEXML_Parser") - install_ace_library("Kokyu") - install_ace_library("TAO") - install_ace_library("TAO_AnyTypeCode") - install_ace_library("TAO_Async_ImR_Client_IDL") - install_ace_library("TAO_Async_IORTable") - install_ace_library("TAO_AV") - install_ace_library("TAO_BiDirGIOP") - install_ace_library("TAO_Catior_i") - install_ace_library("TAO_CodecFactory") - install_ace_library("TAO_Codeset") - install_ace_library("TAO_Compression") - install_ace_library("TAO_CosConcurrency") - install_ace_library("TAO_CosConcurrency_Serv") - install_ace_library("TAO_CosConcurrency_Skel") - install_ace_library("TAO_CosEvent") - install_ace_library("TAO_CosEvent_Serv") - install_ace_library("TAO_CosEvent_Skel") - install_ace_library("TAO_CosLifeCycle") - install_ace_library("TAO_CosLifeCycle_Skel") - install_ace_library("TAO_CosLoadBalancing") - install_ace_library("TAO_CosNaming") - install_ace_library("TAO_CosNaming_Serv") - install_ace_library("TAO_CosNaming_Skel") - install_ace_library("TAO_CosNotification") - install_ace_library("TAO_CosNotification_MC") - install_ace_library("TAO_CosNotification_MC_Ext") - install_ace_library("TAO_CosNotification_Persist") - install_ace_library("TAO_CosNotification_Serv") - install_ace_library("TAO_CosNotification_Skel") - install_ace_library("TAO_CosProperty") - install_ace_library("TAO_CosProperty_Serv") - install_ace_library("TAO_CosProperty_Skel") - install_ace_library("TAO_CosTime") - install_ace_library("TAO_CosTime_Serv") - install_ace_library("TAO_CosTime_Skel") - install_ace_library("TAO_CosTrading") - install_ace_library("TAO_CosTrading_Serv") - install_ace_library("TAO_CosTrading_Skel") - install_ace_library("TAO_CSD_Framework") - install_ace_library("TAO_CSD_ThreadPool") - install_ace_library("TAO_DiffServPolicy") - install_ace_library("TAO_DsEventLogAdmin") - install_ace_library("TAO_DsEventLogAdmin_Serv") - install_ace_library("TAO_DsEventLogAdmin_Skel") - install_ace_library("TAO_DsLogAdmin") - install_ace_library("TAO_DsLogAdmin_Serv") - install_ace_library("TAO_DsLogAdmin_Skel") - install_ace_library("TAO_DsNotifyLogAdmin") - install_ace_library("TAO_DsNotifyLogAdmin_Serv") - install_ace_library("TAO_DsNotifyLogAdmin_Skel") - install_ace_library("TAO_Dynamic_TP") - install_ace_library("TAO_DynamicAny") - install_ace_library("TAO_DynamicInterface") - install_ace_library("TAO_EndpointPolicy") - install_ace_library("TAO_ETCL") - install_ace_library("TAO_FaultTolerance") - install_ace_library("TAO_FT_ClientORB") - install_ace_library("TAO_FT_Naming_Serv") - install_ace_library("TAO_FT_ServerORB") - install_ace_library("TAO_FtNaming") - install_ace_library("TAO_FtNamingReplication") - install_ace_library("TAO_FTORB_Utils") - install_ace_library("TAO_FTRT_ClientORB") - install_ace_library("TAO_FTRT_EventChannel") - install_ace_library("TAO_FtRtEvent") - install_ace_library("TAO_HTIOP") - install_ace_library("TAO_IDL_BE") - install_ace_library("TAO_IDL_FE") - install_ace_library("TAO_IFR_BE") - install_ace_library("TAO_IFR_Client") - install_ace_library("TAO_IFR_Client_skel") - install_ace_library("TAO_IFRService") - install_ace_library("TAO_ImR_Activator") - install_ace_library("TAO_ImR_Activator_IDL") - install_ace_library("TAO_ImR_Client") - install_ace_library("TAO_ImR_Locator") - install_ace_library("TAO_ImR_Locator_IDL") - install_ace_library("TAO_IORInterceptor") - install_ace_library("TAO_IORManip") - install_ace_library("TAO_IORTable") - install_ace_library("TAO_Messaging") - install_ace_library("TAO_Monitor") - install_ace_library("TAO_Notify_Service") - install_ace_library("TAO_ObjRefTemplate") - install_ace_library("TAO_PI") - install_ace_library("TAO_PI_Server") - install_ace_library("TAO_PortableGroup") - install_ace_library("TAO_PortableServer") - install_ace_library("TAO_ReplicationManagerLib") - install_ace_library("TAO_RLECompressor") - install_ace_library("TAO_RT_Notification") - install_ace_library("TAO_RTCORBA") - install_ace_library("TAO_RTCORBAEvent") - install_ace_library("TAO_RTEvent") - install_ace_library("TAO_RTEvent_Serv") - install_ace_library("TAO_RTEvent_Skel") - install_ace_library("TAO_RTEventLogAdmin") - install_ace_library("TAO_RTEventLogAdmin_Serv") - install_ace_library("TAO_RTEventLogAdmin_Skel") - install_ace_library("TAO_RTKokyuEvent") - install_ace_library("TAO_RTPortableServer") - install_ace_library("TAO_RTSched") - install_ace_library("TAO_RTSchedEvent") - install_ace_library("TAO_RTScheduler") - install_ace_library("TAO_Security") - install_ace_library("TAO_SmartProxies") - install_ace_library("TAO_Strategies") - install_ace_library("TAO_Svc_Utils") - install_ace_library("TAO_TC") - install_ace_library("TAO_TC_IIOP") - install_ace_library("TAO_TypeCodeFactory") - install_ace_library("TAO_Utils") - install_ace_library("TAO_Valuetype") - install_ace_library("TAO_ZIOP") - if("ssl" IN_LIST FEATURES) - install_ace_library("ACE_INet_SSL") - install_ace_library("TAO_SSLIOP") - endif() - if("zlib" IN_LIST FEATURES) - install_ace_library("TAO_ZlibCompressor") + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(REMOVE + ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll + ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb + ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd.dll + ${CURRENT_PACKAGES_DIR}/debug/bin/ACEXML_XML_Svc_Conf_Parserd_dll.pdb) endif() endif() - - # Install the executables - function(install_ace_executable ACE_EXECUTABLE) - set(BIN_PATH ${ACE_ROOT}/bin/) - file(INSTALL - ${BIN_PATH}/${ACE_EXECUTABLE}.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} - ) - endfunction() - - if("tao" IN_LIST FEATURES) - install_ace_executable("ace_gperf") - install_ace_executable("tao_catior") - install_ace_executable("tao_idl") - install_ace_executable("tao_ifr") - install_ace_executable("tao_imr") - install_ace_executable("tao_nsadd") - install_ace_executable("tao_nsdel") - install_ace_executable("tao_nsgroup") - install_ace_executable("tao_nslist") - endif() - - vcpkg_copy_pdbs() - - # Handle copyright - file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) FIND_PROGRAM(MAKE make) IF (NOT MAKE) From 80975e5ed345d414b7911c58c8ebc6b8770570c9 Mon Sep 17 00:00:00 2001 From: victor Date: Thu, 28 May 2020 13:52:55 +0200 Subject: [PATCH 3/5] Use lists for directories installation as in #11464 --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 216 ++++++++++++++++++++------------------- 2 files changed, 114 insertions(+), 104 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 3a3377912b82e9..c9ad810f4995e0 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 6.5.9-4 +Version: 6.5.9-3 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 3edc5fa0527cf7..6e697a9b056397 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -130,121 +130,131 @@ if(VCPKG_TARGET_IS_WINDOWS) # ACE itself does not define an install target, so it is not clear which # headers are public and which not. For the moment we install everything # that is in the source path and ends in .h, .inl - function(install_ace_headers_subdirectory ORIGINAL_PATH RELATIVE_PATH) - file(GLOB HEADER_FILES - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h + function(install_includes ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file( + GLOB + HEADER_FILES + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.hpp - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*_T.cpp ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl - ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl - ) - file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl) + file(INSTALL ${HEADER_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + endforeach() endfunction() - # We manually install cpp files found in the ace directory - # see ACE_wrappers\debian\libace-dev.install file - file(GLOB ACE_SOURCE_FILES ${ACE_SOURCE_PATH}/*.cpp) - file(INSTALL ${ACE_SOURCE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/) - # Install headers in subdirectory - install_ace_headers_subdirectory(${ACE_ROOT} "ace") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/Compression") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/Compression/rle") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/ETCL") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/QoS") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/Monitor_Control") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/arpa") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/net") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/netinet") - install_ace_headers_subdirectory(${ACE_ROOT} "ace/os_include/sys") + set(ACE_INCLUDE_FOLDERS + "ace" + "ace/Compression" + "ace/Compression/rle" + "ace/ETCL" + "ace/QoS" + "ace/Monitor_Control" + "ace/os_include" + "ace/os_include/arpa" + "ace/os_include/net" + "ace/os_include/netinet" + "ace/os_include/sys") + install_includes(${ACE_ROOT} "${ACE_INCLUDE_FOLDERS}") + if("ssl" IN_LIST FEATURES) - install_ace_headers_subdirectory(${ACE_ROOT} "ace/SSL") + install_includes(${ACE_ROOT} "ace/SSL") endif() + if("tao" IN_LIST FEATURES) - install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML") - install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/apps") - install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/apps/svcconf") - install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/common") - install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/parser") - install_ace_headers_subdirectory(${ACE_ROOT} "ACEXML/parser/parser") - install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/HTBP") - install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/INet") - install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/RMCast") - install_ace_headers_subdirectory(${ACE_ROOT}/protocols "ace/TMCast") - install_ace_headers_subdirectory(${ACE_ROOT} "Kokyu") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/AV") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Concurrency") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/CosEvent") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Event") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FaultTolerance") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FtRtEvent/ClientORB") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FtRtEvent/EventChannel") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/FtRtEvent/Utils") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/HTIOP") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/IFRService") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/LifeCycle") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/LoadBalancing") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Log") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Naming") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Naming/FaultTolerant") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/Any") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/MonitorControl") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/MonitorControlExt") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/Sequence") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Notify/Structured") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/PortableGroup") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Property") - install_ace_headers_subdirectory(${TAO_ROOT} "orbsvcs/FT_ReplicationManager") - install_ace_headers_subdirectory(${TAO_ROOT} "orbsvcs/Notify_Service") + set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common" + "ACEXML/parser/parser") + install_includes(${ACE_ROOT} "${ACEXML_INCLUDE_FOLDERS}") + + set(ACE_PROTOCOLS_INCLUDE_FOLDERS "ace/HTBP" "ace/INet" "ace/RMCast" + "ace/TMCast") + install_includes(${ACE_ROOT}/protocols "${ACE_PROTOCOLS_INCLUDE_FOLDERS}") + + install_includes(${ACE_ROOT} "Kokyu") + + set(TAO_ORBSVCS_INCLUDE_FOLDERS + "orbsvcs" + "orbsvcs/AV" + "orbsvcs/Concurrency" + "orbsvcs/CosEvent" + "orbsvcs/Event" + "orbsvcs/FaultTolerance" + "orbsvcs/FtRtEvent/ClientORB" + "orbsvcs/FtRtEvent/EventChannel" + "orbsvcs/FtRtEvent/Utils" + "orbsvcs/HTIOP" + "orbsvcs/IFRService" + "orbsvcs/LifeCycle" + "orbsvcs/LoadBalancing" + "orbsvcs/Log" + "orbsvcs/Naming" + "orbsvcs/Naming/FaultTolerant" + "orbsvcs/Notify" + "orbsvcs/Notify/Any" + "orbsvcs/Notify/MonitorControl" + "orbsvcs/Notify/MonitorControlExt" + "orbsvcs/Notify/Sequence" + "orbsvcs/Notify/Structured" + "orbsvcs/PortableGroup" + "orbsvcs/Property" + "orbsvcs/Sched" + "orbsvcs/Security" + "orbsvcs/Time" + "orbsvcs/Trader") if("ssl" IN_LIST FEATURES) - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/SSLIOP") + list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP") endif() - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Sched") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Security") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Time") - install_ace_headers_subdirectory(${TAO_ROOT}/orbsvcs "orbsvcs/Trader") - install_ace_headers_subdirectory(${TAO_ROOT} "tao") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/AnyTypeCode") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/BiDir_GIOP") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/CSD_Framework") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/CSD_ThreadPool") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/CodecFactory") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Codeset") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Compression") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Compression/rle") + install_includes(${TAO_ROOT}/orbsvcs "${TAO_ORBSVCS_INCLUDE_FOLDERS}") + + set(TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/FT_ReplicationManager" + "orbsvcs/Notify_Service") + install_includes(${TAO_ROOT} "${TAO_ROOT_ORBSVCS_INCLUDE_FOLDERS}") + + set(TAO_INCLUDE_FOLDERS + "tao" + "tao/AnyTypeCode" + "tao/BiDir_GIOP" + "tao/CSD_Framework" + "tao/CSD_ThreadPool" + "tao/CodecFactory" + "tao/Codeset" + "tao/Compression" + "tao/Compression/rle" + "tao/DiffServPolicy" + "tao/DynamicAny" + "tao/DynamicInterface" + "tao/Dynamic_TP" + "tao/ETCL" + "tao/EndpointPolicy" + "tao/IFR_Client" + "tao/IORInterceptor" + "tao/IORManipulation" + "tao/IORTable" + "tao/ImR_Client" + "tao/Messaging" + "tao/Monitor" + "tao/ObjRefTemplate" + "tao/PI" + "tao/PI_Server" + "tao/PortableServer" + "tao/RTCORBA" + "tao/RTPortableServer" + "tao/RTScheduling" + "tao/SmartProxies" + "tao/Strategies" + "tao/TransportCurrent" + "tao/TypeCodeFactory" + "tao/Utils" + "tao/Valuetype" + "tao/ZIOP") if("zlib" IN_LIST FEATURES) - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Compression/zlib") + list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib") endif() - install_ace_headers_subdirectory(${TAO_ROOT} "tao/DiffServPolicy") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/DynamicAny") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/DynamicInterface") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Dynamic_TP") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/ETCL") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/EndpointPolicy") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/IFR_Client") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/IORInterceptor") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/IORManipulation") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/IORTable") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/ImR_Client") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Messaging") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Monitor") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/ObjRefTemplate") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/PI") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/PI_Server") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/PortableServer") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/RTCORBA") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/RTPortableServer") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/RTScheduling") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/SmartProxies") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Strategies") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/TransportCurrent") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/TypeCodeFactory") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Utils") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/Valuetype") - install_ace_headers_subdirectory(${TAO_ROOT} "tao/ZIOP") + install_includes(${TAO_ROOT} "${TAO_INCLUDE_FOLDERS}") endif() # Remove dlls without any export From f732872e87cf85ff6367e337b98a59821962caac Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 29 May 2020 10:47:45 +0200 Subject: [PATCH 4/5] Update to version 6.5.9-4 --- ports/ace/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index c9ad810f4995e0..3a3377912b82e9 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 6.5.9-3 +Version: 6.5.9-4 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment From bccd1632c0ae26212679f5dbb3746464abcee05a Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 3 Jun 2020 13:38:42 +0200 Subject: [PATCH 5/5] Update version --- ports/ace/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 3a3377912b82e9..eff758e7521e37 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 6.5.9-4 +Version: 6.5.9-5 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment