mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[zeroc-ice] New port (#23764)
* Initial commit * clean up * updated manifest and version * Removed C++11 mapping option (feature) and made C++11 the default mapping. * updated version * added main target added entries to ci.baseline.txt * corrected ci.baseline.txt entries * updated version * fixed generated header path * Updated version * fixed include paths * updated version * expect x64-windows-static to fail * added patches for clang 13 * update version * Update ports/zeroc-ice/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * 2->4 spaces * Removed v144/5 stuff * check for .DS_Store file before deletion * several changes * format vcpkg.json * update version * remove typo * updated version * reformatting * resolve review issues * regex * updated version * windows-static * allow static builds on windows and added maintainer * updated version * added openssl as a dependency for Ice core library * updated version * minor updates Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
This commit is contained in:
parent
8f443619b2
commit
1c9b23ba2b
21
ports/zeroc-ice/md5i_fix.patch
Normal file
21
ports/zeroc-ice/md5i_fix.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp
|
||||
index 66f4de545b..271352d1ea 100644
|
||||
--- a/cpp/src/Slice/MD5I.cpp
|
||||
+++ b/cpp/src/Slice/MD5I.cpp
|
||||
@@ -52,6 +52,7 @@
|
||||
*/
|
||||
|
||||
#include <Slice/MD5I.h>
|
||||
+#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
|
||||
* On little-endian machines, we can process properly aligned
|
||||
* data without copying it.
|
||||
*/
|
||||
- if (!((data - (const md5_byte_t *)0) & 3)) {
|
||||
+ if (!((reinterpret_cast<uintptr_t>(data)) & 3)) {
|
||||
/* data are properly aligned */
|
||||
X = (const md5_word_t *)data;
|
||||
} else {
|
288
ports/zeroc-ice/portfile.cmake
Normal file
288
ports/zeroc-ice/portfile.cmake
Normal file
@ -0,0 +1,288 @@
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO zeroc-ice/ice
|
||||
REF v3.7.7
|
||||
SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee
|
||||
PATCHES md5i_fix.patch slice2swift.patch
|
||||
)
|
||||
|
||||
set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel)
|
||||
set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg)
|
||||
|
||||
get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME)
|
||||
set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX})
|
||||
set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX})
|
||||
set(UNIX_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/src/${SOURCE_PATH_SUFFIX})
|
||||
|
||||
# install_includes
|
||||
function(install_includes ORIGINAL_PATH RELATIVE_PATHS)
|
||||
foreach(RELATIVE_PATH ${RELATIVE_PATHS})
|
||||
file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h)
|
||||
if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH})
|
||||
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH})
|
||||
endif()
|
||||
endforeach()
|
||||
endfunction()
|
||||
|
||||
# install_slices
|
||||
function(install_slices ORIGINAL_PATH RELATIVE_PATHS)
|
||||
foreach(RELATIVE_PATH ${RELATIVE_PATHS})
|
||||
file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.ice)
|
||||
if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH})
|
||||
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH})
|
||||
endif()
|
||||
endforeach()
|
||||
endfunction()
|
||||
|
||||
vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES
|
||||
"Glacier2"
|
||||
"Ice"
|
||||
"IceBT"
|
||||
"IceBox"
|
||||
"IceBT"
|
||||
"IceDiscovery"
|
||||
"IceGrid"
|
||||
"IceIAP"
|
||||
"IceLocatorDiscovery"
|
||||
"IcePatch2"
|
||||
"IceSSL"
|
||||
"IceStorm"
|
||||
)
|
||||
|
||||
set(ICE_OPTIONAL_COMPONENTS_MSBUILD "")
|
||||
set(ICE_OPTIONAL_COMPONENTS_MAKE "Ice") # Intentional!
|
||||
|
||||
# IceSSL
|
||||
if("icessl" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icessl++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceSSL")
|
||||
endif()
|
||||
|
||||
# Glacier2
|
||||
if("glacier2lib" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\glacier2++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2")
|
||||
endif()
|
||||
|
||||
# Glacier2Router
|
||||
if("glacier2router" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2router")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2cryptpermissionsverifier")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "glacier2router")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2CryptPermissionsVerifier")
|
||||
endif()
|
||||
|
||||
# IceBox
|
||||
if("iceboxlib" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\iceboxlib++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceBox")
|
||||
endif()
|
||||
|
||||
# IceBox
|
||||
if("iceboxtools" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icebox++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\iceboxadmin")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebox")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "iceboxadmin")
|
||||
endif()
|
||||
|
||||
# IceGrid
|
||||
if("icegridlib" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icegrid++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceGrid")
|
||||
endif()
|
||||
|
||||
# IceGrid tools
|
||||
if("icegridtools" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridadmin")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridregistry")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridnode")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridregistry")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode")
|
||||
endif()
|
||||
|
||||
# IceStorm
|
||||
if("icestormlib" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icestorm++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStorm")
|
||||
endif()
|
||||
|
||||
# IceStormAdmin
|
||||
if("icestormtools" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormadmin")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormservice")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormdb")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormadmin")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStormService")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormdb")
|
||||
endif()
|
||||
|
||||
# IceBridge executable
|
||||
if("icebridge" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icebridge")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebridge")
|
||||
endif()
|
||||
|
||||
# IceDiscovery
|
||||
if("icediscovery" IN_LIST FEATURES)
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icediscovery++11")
|
||||
vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery")
|
||||
endif()
|
||||
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
|
||||
# Setting these as environment variables, as .d files aren't generated
|
||||
# the first time passing them as arguments to make.
|
||||
set(ENV{MCPP_HOME} ${CURRENT_INSTALLED_DIR})
|
||||
set(ENV{EXPAT_HOME} ${CURRENT_INSTALLED_DIR})
|
||||
set(ENV{BZ2_HOME} ${CURRENT_INSTALLED_DIR})
|
||||
set(ENV{LMDB_HOME} ${CURRENT_INSTALLED_DIR})
|
||||
set(ENV{CPPFLAGS} "-I${CURRENT_INSTALLED_DIR}/include")
|
||||
set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/debug/lib")
|
||||
|
||||
set(ICE_BUILD_CONFIG "shared cpp11-shared")
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
set(ICE_BUILD_CONFIG "static cpp11-static")
|
||||
endif()
|
||||
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
|
||||
vcpkg_execute_build_process(
|
||||
COMMAND make
|
||||
V=1
|
||||
"prefix=${CURRENT_PACKAGES_DIR}/debug"
|
||||
linux_id=vcpkg
|
||||
"CONFIGS=${ICE_BUILD_CONFIG}"
|
||||
USR_DIR_INSTALL=yes
|
||||
OPTIMIZE=no
|
||||
${ICE_OPTIONAL_COMPONENTS_MAKE}
|
||||
"-j${VCPKG_CONCURRENCY}"
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
|
||||
LOGNAME make-${TARGET_TRIPLET}-dbg
|
||||
)
|
||||
|
||||
# Install debug libraries to packages directory
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
|
||||
file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*")
|
||||
else()
|
||||
file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*")
|
||||
endif()
|
||||
file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
||||
|
||||
# Clean up for the next round
|
||||
vcpkg_execute_build_process(
|
||||
COMMAND make distclean
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
|
||||
LOGNAME make-clean-${TARGET_TRIPLET}
|
||||
)
|
||||
|
||||
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib")
|
||||
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib")
|
||||
endif()
|
||||
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
|
||||
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64")
|
||||
endif()
|
||||
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin")
|
||||
|
||||
# Release build
|
||||
set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib")
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-rel")
|
||||
vcpkg_execute_build_process(
|
||||
COMMAND make
|
||||
V=1
|
||||
"prefix=${CURRENT_PACKAGES_DIR}"
|
||||
linux_id=vcpkg
|
||||
"CONFIGS=${ICE_BUILD_CONFIG}"
|
||||
USR_DIR_INSTALL=yes
|
||||
OPTIMIZE=yes
|
||||
${ICE_OPTIONAL_COMPONENTS_MAKE}
|
||||
"-j${VCPKG_CONCURRENCY}"
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
|
||||
LOGNAME make-${TARGET_TRIPLET}-rel
|
||||
)
|
||||
|
||||
# Install release libraries and other files to packages directory
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice")
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
|
||||
install_includes("${UNIX_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}")
|
||||
install_includes("${UNIX_BUILD_DIR}/cpp/include/generated" "${ICE_INCLUDE_SUB_DIRECTORIES}")
|
||||
install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}")
|
||||
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
|
||||
file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*")
|
||||
else()
|
||||
file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*")
|
||||
endif()
|
||||
file(COPY ${ICE_RELEASE_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
||||
file(GLOB ICE_RELEASE_EXECUTABLES "${UNIX_BUILD_DIR}/cpp/bin/*")
|
||||
file(COPY ${ICE_RELEASE_EXECUTABLES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
|
||||
|
||||
# Clean up
|
||||
vcpkg_execute_build_process(
|
||||
COMMAND make distclean
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}/cpp
|
||||
LOGNAME make-clean-after-build-${TARGET_TRIPLET}
|
||||
)
|
||||
|
||||
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib")
|
||||
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib")
|
||||
endif()
|
||||
if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64")
|
||||
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64")
|
||||
endif()
|
||||
file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin")
|
||||
|
||||
else() # VCPKG_TARGET_IS_WINDOWS
|
||||
|
||||
# Fix project files to prevent nuget restore of dependencies and
|
||||
# remove hard coded runtime linkage
|
||||
include("${CURRENT_PORT_DIR}/prepare_for_build.cmake")
|
||||
prepare_for_build("${SOURCE_PATH}")
|
||||
|
||||
# Build Ice
|
||||
vcpkg_install_msbuild(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln"
|
||||
SKIP_CLEAN
|
||||
TARGET "C++11\\ice++11"
|
||||
USE_VCPKG_INTEGRATION
|
||||
OPTIONS
|
||||
/p:UseVcpkg=yes
|
||||
/p:IceBuildingSrc=yes
|
||||
${ICE_OPTIONAL_COMPONENTS_MSBUILD}
|
||||
)
|
||||
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll")
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll")
|
||||
endif()
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll")
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll")
|
||||
endif()
|
||||
|
||||
install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}")
|
||||
install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include/generated/cpp11/${TRIPLET_SYSTEM_ARCH}/Release" "${ICE_INCLUDE_SUB_DIRECTORIES}")
|
||||
|
||||
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice")
|
||||
install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
vcpkg_clean_msbuild()
|
||||
|
||||
endif()
|
||||
|
||||
# Remove unnecessary static libraries.
|
||||
file(GLOB PDLIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*")
|
||||
file(GLOB PRLIBS "${CURRENT_PACKAGES_DIR}/lib/*")
|
||||
list(FILTER PDLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$")
|
||||
list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$")
|
||||
file(REMOVE ${PDLIBS} ${PRLIBS})
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright)
|
60
ports/zeroc-ice/prepare_for_build.cmake
Normal file
60
ports/zeroc-ice/prepare_for_build.cmake
Normal file
@ -0,0 +1,60 @@
|
||||
|
||||
# This function removes hardcoded RuntimeLibrary directives from Ice's vcxproh files and downloads
|
||||
# Ice Builder for MSBuild, which is required to generate C++ files based on the interface definition
|
||||
# files (.ice).
|
||||
|
||||
function(prepare_for_build ICE_SOURCE_DIR)
|
||||
|
||||
message("-- Removing hardcoded 'RuntimeLibrary' directives from .vcxproj files")
|
||||
set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src")
|
||||
file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj")
|
||||
foreach(PROJ_FILE ${PROJ_FILES})
|
||||
file(READ ${PROJ_FILE} PROJ_FILE_CONTENT)
|
||||
STRING(REGEX
|
||||
REPLACE
|
||||
"<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\">"
|
||||
"<Target Name=\"EnsureNuGetPackageBuildImports\" BeforeTargets=\"PrepareForBuild\" Condition=\"'$(UseVcpkg)' != 'yes'\">"
|
||||
PROJ_FILE_CONTENT
|
||||
"${PROJ_FILE_CONTENT}"
|
||||
)
|
||||
STRING(REGEX
|
||||
REPLACE
|
||||
"<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>"
|
||||
""
|
||||
PROJ_FILE_CONTENT
|
||||
"${PROJ_FILE_CONTENT}"
|
||||
)
|
||||
STRING(REGEX
|
||||
REPLACE
|
||||
"<RuntimeLibrary>MultiThreaded</RuntimeLibrary>"
|
||||
""
|
||||
PROJ_FILE_CONTENT
|
||||
"${PROJ_FILE_CONTENT}"
|
||||
)
|
||||
file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}")
|
||||
endforeach()
|
||||
|
||||
set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages")
|
||||
set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7")
|
||||
if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}")
|
||||
message("-- Making Ice Builder for MSBuild available")
|
||||
vcpkg_download_distfile(
|
||||
ICE_BUILDER_MSBUILD_ARCHIVE
|
||||
URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg
|
||||
FILENAME zeroc.icebuilder.msbuild.5.0.7.zip
|
||||
SHA512 d4afed8a3c67daf2e1cde09e7747ec9f088fa1354069bb7c7782c1089ea0f4e50b669f45a88502ad341dbccafbc1394d74fe764479f25bf4be1d3f70e66cb174
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
ICE_BUILDER_MSBUILD_DIRECTORY
|
||||
ARCHIVE
|
||||
"${ICE_BUILDER_MSBUILD_ARCHIVE}"
|
||||
NO_REMOVE_ONE_LEVEL
|
||||
SOURCE_BASE icebuilder
|
||||
)
|
||||
|
||||
file(MAKE_DIRECTORY "${ICE_SOURCE_DIR}/cpp/msbuild/packages")
|
||||
file(RENAME "${ICE_BUILDER_MSBUILD_DIRECTORY}" "${ICE_BUILDER_DEST_DIRECTORY}")
|
||||
endif()
|
||||
|
||||
endfunction()
|
25
ports/zeroc-ice/slice2swift.patch
Normal file
25
ports/zeroc-ice/slice2swift.patch
Normal file
@ -0,0 +1,25 @@
|
||||
diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
|
||||
index 404dee7670..01e144de90 100644
|
||||
--- a/cpp/src/slice2swift/SwiftUtil.cpp
|
||||
+++ b/cpp/src/slice2swift/SwiftUtil.cpp
|
||||
@@ -1523,7 +1523,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out,
|
||||
const DataMemberList& baseMembers,
|
||||
const DataMemberList& allMembers,
|
||||
const ContainedPtr& p,
|
||||
- bool local,
|
||||
+ bool /*local*/,
|
||||
bool rootClass,
|
||||
const StringPairList& extraParams)
|
||||
{
|
||||
@@ -1531,11 +1531,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out,
|
||||
{
|
||||
out << sp;
|
||||
out << nl;
|
||||
- int typeCtx = TypeContextInParam;
|
||||
- if(local)
|
||||
- {
|
||||
- typeCtx |= TypeContextLocal;
|
||||
- }
|
||||
out << "public init" << spar;
|
||||
for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i)
|
||||
{
|
125
ports/zeroc-ice/vcpkg.json
Normal file
125
ports/zeroc-ice/vcpkg.json
Normal file
@ -0,0 +1,125 @@
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"version": "3.7.7",
|
||||
"maintainers": "Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>",
|
||||
"description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.",
|
||||
"homepage": "https://github.com/zeroc-ice/ice",
|
||||
"license": null,
|
||||
"supports": "!uwp & !(windows & arm) & !wasm32",
|
||||
"dependencies": [
|
||||
"bzip2",
|
||||
"expat",
|
||||
"lmdb",
|
||||
"mcpp",
|
||||
{
|
||||
"name": "openssl",
|
||||
"platform": "!windows"
|
||||
},
|
||||
"zlib"
|
||||
],
|
||||
"features": {
|
||||
"glacier2lib": {
|
||||
"description": "Glacier2 libraries"
|
||||
},
|
||||
"glacier2router": {
|
||||
"description": "Glacier2Router",
|
||||
"supports": "!static",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"features": [
|
||||
"glacier2lib",
|
||||
"icessl"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"iceboxlib": {
|
||||
"description": "IceBox libraries and runtime"
|
||||
},
|
||||
"iceboxtools": {
|
||||
"description": "IceBox tools",
|
||||
"supports": "!static"
|
||||
},
|
||||
"icebridge": {
|
||||
"description": "IceBridge",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"features": [
|
||||
"iceboxlib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"icediscovery": {
|
||||
"description": "IceDiscovery",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"features": [
|
||||
"glacier2lib",
|
||||
"iceboxlib",
|
||||
"icessl",
|
||||
"icestormlib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"icegridlib": {
|
||||
"description": "IceGrid library",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"features": [
|
||||
"glacier2lib"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"icegridtools": {
|
||||
"description": "IceGrid tools",
|
||||
"supports": "!static",
|
||||
"dependencies": [
|
||||
"expat",
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"features": [
|
||||
"glacier2lib",
|
||||
"iceboxlib",
|
||||
"icegridlib",
|
||||
"icessl"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"icessl": {
|
||||
"description": "IceSSL",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"platform": "!windows"
|
||||
}
|
||||
]
|
||||
},
|
||||
"icestormlib": {
|
||||
"description": "IceStorm library"
|
||||
},
|
||||
"icestormtools": {
|
||||
"description": "IceStorm tools",
|
||||
"supports": "!static",
|
||||
"dependencies": [
|
||||
"lmdb",
|
||||
{
|
||||
"name": "zeroc-ice",
|
||||
"features": [
|
||||
"glacier2lib",
|
||||
"iceboxlib",
|
||||
"icegridlib",
|
||||
"icestormlib"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
@ -1421,3 +1421,8 @@ workflow:arm-uwp=fail
|
||||
# See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639
|
||||
dimcli:x64-windows-static-md=fail
|
||||
dimcli:x64-windows-static=fail
|
||||
|
||||
# ZeroC doesn't provide ARM tagets in project files.
|
||||
zeroc-ice:arm64-windows=fail
|
||||
zeroc-ice:arm-uwp=fail
|
||||
zeroc-ice:x64-uwp=fail
|
@ -7652,6 +7652,10 @@
|
||||
"baseline": "1.0",
|
||||
"port-version": 1
|
||||
},
|
||||
"zeroc-ice": {
|
||||
"baseline": "3.7.7",
|
||||
"port-version": 0
|
||||
},
|
||||
"zeromq": {
|
||||
"baseline": "4.3.4",
|
||||
"port-version": 5
|
||||
|
9
versions/z-/zeroc-ice.json
Normal file
9
versions/z-/zeroc-ice.json
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b",
|
||||
"version": "3.7.7",
|
||||
"port-version": 0
|
||||
}
|
||||
]
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user