[zeroc-ice] New port

ports/zeroc-ice/fixProjFiles.ps1

@@ -0,0 +1,41 @@
+
+$rootPath=$args[0]
+
+$cppSrcPath = "$rootPath/cpp/src"
+if($cppSrcPath)
+{
+Write-Output "Processing $cppSrcPath"
+$projectFiles = Get-ChildItem -Path $cppSrcPath -Filter *.vcxproj -Recurse -ErrorAction SilentlyContinue -Force
+
+  foreach($proj in $projectFiles)
+  {
+      Write-Output $proj.FullName
+      $content = Get-Content -Path $proj.FullName
+      $content = $content -replace '<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">', '<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="''$(UseVcpkg)'' != ''yes''">'
+      $content = $content -replace '<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>',''
+      $content = $content -replace '<RuntimeLibrary>MultiThreaded</RuntimeLibrary>',''
+      $content | Set-Content -Path $proj.FullName
+  }
+}
+else
+{
+  Write-Error "Error: No path defined!"
+}
+
+# Download nuget file with .zip extention to temporary folder
+$tmpPath = [System.IO.Path]::GetTempPath()
+$msbuilderDlPath = "$tmpPath/zeroc.icebuilder.msbuild.5.0.7.zip"
+Invoke-WebRequest -Uri "https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg" -OutFile $msbuilderDlPath
+
+# Ensure destination folder exists.
+$msBuilderPath = "$rootPath/cpp/msbuild/packages/zeroc.icebuilder.msbuild.5.0.7"
+if(-Not (Test-Path -Path $msBuilderPath))
+{
+  New-Item -Path $msBuilderPath -ItemType Directory -Force
+}
+
+# Extract nuget archive to $msBuilderPath and remove the downloaded file
+Expand-Archive -Path $msbuilderDlPath -DestinationPath $msBuilderPath
+Remove-Item -Path $msbuilderDlPath
+
+

ports/zeroc-ice/md5i_fix.patch

@@ -0,0 +1,13 @@
+diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp
+index 66f4de545b..2430b1fd1b 100644
+--- a/cpp/src/Slice/MD5I.cpp
++++ b/cpp/src/Slice/MD5I.cpp
+@@ -172,7 +172,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 {

ports/zeroc-ice/portfile.cmake

@@ -0,0 +1,239 @@
+
+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(RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX})
+set(DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX})
+
+
+  set(ICE_OPTIONAL_COMPONENTS_MSBUILD "")
+  set(ICE_OPTIONAL_COMPONENTS_MAKE "")
+
+  # 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 "src/IceSSL")
+  endif()
+
+  # Glacier2
+  if("glacier2" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\glacier2++11")
+  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")
+  endif()
+
+  # IceBox
+  if("icebox" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\iceboxlib++11")
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icebox++11")
+  endif()
+
+  # IceBoxAdmin executable
+  if("iceboxadmin" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\iceboxadmin")
+  endif()
+
+  # IceGrid
+  if("icegrid" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icegrid++11")
+  endif()
+
+  # IceGridAdmin 
+  if("icegridadmin" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridadmin")
+  endif()
+
+  # IceGridRegistry 
+  if("icegridregistry" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridregistry")
+  endif()
+
+  # IceGridNode 
+  if("icegridnode" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridnode")
+  endif()
+
+  # IceStorm
+  if("icestorm" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icestorm++11")
+  endif()
+
+  # IceStormAdmin 
+  if("icestormadmin" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormadmin")
+  endif()
+
+  # IceStormService 
+  if("icestormservice" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormservice")
+  endif()
+
+  # IceStormDB 
+  if("icestormdb" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormdb")
+  endif()
+
+  # IceBridge executable 
+  if("icebridge" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icebridge")
+  endif()
+
+  # IceDiscovery
+  if("icediscovery" IN_LIST FEATURES)
+    vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icediscovery++11")
+  endif()
+
+
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+
+  # Setting these as environment variables, as .d files aren't generated the first time passing them 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 "cpp11-shared")
+  if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "static")
+    set(ICE_BUILD_CONFIG "cpp11-static")
+  endif()
+
+  message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+  vcpkg_execute_build_process(
+    COMMAND make install 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
+  )
+
+  # Clean up for the next round
+  vcpkg_execute_build_process(
+    COMMAND make distclean 
+    WORKING_DIRECTORY ${SOURCE_PATH}/cpp
+    LOGNAME make-clean-${TARGET_TRIPLET}
+  )
+
+  # Release build
+  set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib")
+  message(STATUS "Building ${TARGET_TRIPLET}-rel")
+  vcpkg_execute_build_process(
+    COMMAND make install V=1 prefix=${CURRENT_PACKAGES_DIR} linux_id=vcpkg CONFIGS=${ICE_BUILD_CONFIG} LANGUAGES=cpp USR_DIR_INSTALL=yes OPTIMIZE=yes -j${VCPKG_CONCURRENCY} srcs
+    WORKING_DIRECTORY ${SOURCE_PATH}/cpp
+    LOGNAME make-${TARGET_TRIPLET}-rel
+  )
+
+  if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib64")
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib64 ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib64 ${CURRENT_PACKAGES_DIR}/lib)
+  endif()
+
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+else(NOT VCPKG_TARGET_IS_WINDOWS)
+
+  # Fix project files to prevent nuget restore of dependencies and 
+  # remove hard coded runtime linkage
+  vcpkg_execute_required_process(
+    COMMAND powershell ${CURRENT_PORT_DIR}/fixProjFiles.ps1 "${SOURCE_PATH}"
+    LOGNAME fixProjFiles-${TARGET_TRIPLET}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
+  )
+
+
+
+
+set(MSVC_TOOLSET_VER ${VCPKG_PLATFORM_TOOLSET})
+if(${VCPKG_PLATFORM_TOOLSET} STREQUAL "v144" OR ${VCPKG_PLATFORM_TOOLSET} STREQUAL "v145")
+  set(MSVC_TOOLSET_VER "v143")
+endif()
+
+  # 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 
+  function(install_includes ORIGINAL_PATH RELATIVE_PATHS)
+    foreach(RELATIVE_PATH ${RELATIVE_PATHS})
+      file(
+        GLOB
+        HEADER_FILES
+        ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h)
+      file(COPY ${HEADER_FILES}
+           DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH})
+    endforeach()
+  endfunction()
+
+  # Install header files
+  set(INCLUDE_SUB_DIRECTORIES
+    "Glacier2"
+    "Ice"
+    "IceBox"
+    "IceGrid"
+    "IcePatch2"
+    "IceSSL"
+    "IceStorm"
+    "IceUtil"
+  )
+
+  install_includes("${RELEASE_BUILD_DIR}/cpp/include" "${INCLUDE_SUB_DIRECTORIES}")
+
+  set(INCLUDE_GEN_SUB_DIRECTORIES
+    "Glacier2"
+    "Ice"
+    "IceBox"
+    "IceSSL"
+    "IceStorm"
+  )
+  install_includes("${RELEASE_BUILD_DIR}/cpp/include/generated/cpp11/${TRIPLET_SYSTEM_ARCH}/Release" "${INCLUDE_GEN_SUB_DIRECTORIES}")
+
+  vcpkg_clean_msbuild()
+
+endif(NOT VCPKG_TARGET_IS_WINDOWS)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+if(VCPKG_TARGET_IS_OSX)
+  file(REMOVE "${CURRENT_PACKAGES_DIR}/.DS_Store")
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright)

ports/zeroc-ice/slice2swift.patch

@@ -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)
+         {