The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ace] tao as feature (#11473)

Browse Source 
* Add tao as feature for ace

* Use vcpkg_install_msbuild instead of vcpkg_build_msbuild

* Use lists for directories installation as in #11464

* Update to version 6.5.9-4

* Update version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
victorburckel 2020-06-12 07:27:55 +02:00 committed by GitHub
parent e1783c68c4
commit 0df89ff50e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 203 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/ace/CONTROL
View File

@ -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
@ -12,3 +12,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

295
ports/ace/portfile.cmake
View File

@ -1,20 +1,38 @@
# 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")
@ -104,137 +112,224 @@ 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} ${MPC_VALUE_TEMPLATE}
COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE}
WORKING_DIRECTORY ${ACE_ROOT}
LOGNAME mwc-${TARGET_TRIPLET}
)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_build_msbuild(
PROJECT_PATH ${ACE_SOURCE_PATH}/ace.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
function(install_includes SOURCE_PATH SUBDIRECTORIES INCLUDE_DIR)
foreach(SUB_DIR ${SUBDIRECTORIES})
file(GLOB HEADER_FILES ${SOURCE_PATH}/${SUB_DIR}/*.h ${SOURCE_PATH}/${SUB_DIR}/*.inl ${SOURCE_PATH}/${SUB_DIR}/*.cpp)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${INCLUDE_DIR}/${SUB_DIR})
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}/*.cpp
${ORIGINAL_PATH}/${RELATIVE_PATH}/*.idl
${ORIGINAL_PATH}/${RELATIVE_PATH}/*.pidl)
file(INSTALL ${HEADER_FILES}
DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH})
endforeach()
endfunction()
# Install headers
set(ACE_INCLUDE_FOLDERS "." "Compression" "Compression/rle" "ETCL" "QoS" "Monitor_Control" "os_include" "os_include/arpa" "os_include/net" "os_include/netinet" "os_include/sys")
install_includes(${ACE_SOURCE_PATH} "${ACE_INCLUDE_FOLDERS}" "ace")
if("ssl" IN_LIST FEATURES)
set(ACE_INCLUDE_FOLDERS "SSL")
install_includes(${ACE_SOURCE_PATH} "${ACE_INCLUDE_FOLDERS}" "ace")
endif()
# Install the libraries
function(install_libraries SOURCE_PATH LIBRARIES)
foreach(LIBRARY ${LIBRARIES})
set(LIB_PATH ${SOURCE_PATH}/lib/)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
# Install the DLL files
file(INSTALL
${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
)
file(INSTALL
${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/bin
)
endif()
# Install the lib files
file(INSTALL
${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
)
file(INSTALL
${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
)
endforeach()
endfunction()
set(ACE_LIBRARIES "ACE" "ACE_Compression" "ACE_ETCL" "ACE_ETCL_Parser" "ACE_Monitor_Control" "ACE_QoS" "ACE_RLECompression")
install_libraries(${ACE_ROOT} "${ACE_LIBRARIES}")
# Install headers in subdirectory
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)
set(ACE_LIBRARIES "ACE_SSL")
install_libraries(${ACE_ROOT} "${ACE_LIBRARIES}")
install_includes(${ACE_ROOT} "ace/SSL")
endif()
vcpkg_copy_pdbs()
if("tao" IN_LIST FEATURES)
set(ACEXML_INCLUDE_FOLDERS "ACEXML/apps/svcconf" "ACEXML/common"
"ACEXML/parser/parser")
install_includes(${ACE_ROOT} "${ACEXML_INCLUDE_FOLDERS}")
# Handle copyright
file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
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)
list(APPEND TAO_ORBSVCS_INCLUDE_FOLDERS "orbsvcs/SSLIOP")
endif()
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)
list(APPEND TAO_INCLUDE_FOLDERS "tao/Compression/zlib")
endif()
install_includes(${TAO_ROOT} "${TAO_INCLUDE_FOLDERS}")
endif()
# Remove dlls without any export
if("tao" IN_LIST FEATURES)
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()
elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
FIND_PROGRAM(MAKE make)
IF (NOT MAKE)
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)