diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index ae68509292..4d467a3c79 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -1,14 +1,3 @@ -# Check architecture: -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(BUILD_ARCH "ARM") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - # Check library linkage: vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) @@ -28,14 +17,12 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP: vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj" - PLATFORM ${BUILD_ARCH} USE_VCPKG_INTEGRATION ) elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32: vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "3FD/3FD.vcxproj" - PLATFORM ${BUILD_ARCH} TARGET Build USE_VCPKG_INTEGRATION ) diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json index 5ee8f2d4ec..8dbaa3a670 100644 --- a/ports/3fd/vcpkg.json +++ b/ports/3fd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "3fd", "version": "2.6.3", - "port-version": 2, + "port-version": 3, "description": "C++ Framework For Fast Development", "supports": "windows & !static & !arm64", "dependencies": [ diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index c817bc2c25..b2b4af77fc 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -65,12 +65,6 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) vcpkg_add_to_path("${PERL_PATH}") -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(MSBUILD_PLATFORM "Win32") -else () - set(MSBUILD_PLATFORM "${TRIPLET_SYSTEM_ARCH}") -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) @@ -142,7 +136,6 @@ if(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH} LICENSE_SUBPATH COPYING - PLATFORM ${MSBUILD_PLATFORM} SKIP_CLEAN ) @@ -285,7 +278,6 @@ if(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} LICENSE_SUBPATH COPYING - PLATFORM ${MSBUILD_PLATFORM} SKIP_CLEAN ) diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index c0290ba2f2..3280d76579 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ace", "version": "7.1.0", + "port-version": 1, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 2950f3fe7b..2a08698cc6 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -1,5 +1,3 @@ -set(VERSION 3.9.5) - set(PATCHES ) if (NOT VCPKG_TARGET_IS_LINUX) set(PATCHES FunctionLevelLinkingOn.diff) @@ -17,7 +15,7 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES ${PATCHES} ) @@ -65,12 +63,10 @@ else() vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib") endif() - if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(BUILD_ARCH "Win32") - elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - set(BUILD_ARCH "x64") else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") + set(BUILD_ARCH "${VCPKG_TARGET_ARCHITECTURE}") endif() string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}") @@ -108,13 +104,13 @@ else() endif() endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) - if (ACTIVEMQCPP_SHARED_LIB) + if(ACTIVEMQCPP_SHARED_LIB) file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index 131b974415..54ed5e65c4 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 11, + "port-version": 12, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", "supports": "!(uwp | osx)", diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index d67dc1d8fd..0e4e62c5d2 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -9,14 +9,6 @@ vcpkg_from_github( PATCHES fix-build.patch ) -if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(BUILD_ARCH "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_ARCH "x64") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() - # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" foreach(VCXPROJ IN ITEMS "${SOURCE_PATH}/EasyHookDll/EasyHookDll.vcxproj" @@ -78,7 +70,6 @@ vcpkg_install_msbuild( TARGET EasyHookDll RELEASE_CONFIGURATION "netfx4-Release" DEBUG_CONFIGURATION "netfx4-Debug" - PLATFORM ${BUILD_ARCH} ) # Remove the mismatch rebuild library diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index 0a894137ad..44ba815c74 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyhook", "version": "2.7.7097.0", - "port-version": 5, + "port-version": 6, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", "supports": "windows & !static & !uwp & (x86 | x64)" diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 98f5c2e134..438ad5f9e4 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) -endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) @@ -24,22 +20,22 @@ vcpkg_from_github( ) vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH ECSUtil.sln - PLATFORM ${PLATFORM} + PLATFORM "${TRIPLET_SYSTEM_ARCH}" LICENSE_SUBPATH license.txt TARGET ECSUtil - RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} + RELEASE_CONFIGURATION "${ECSUtil_CONFIGURATION_RELEASE}" + DEBUG_CONFIGURATION "${ECSUtil_CONFIGURATION_DEBUG}" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +file(COPY "${SOURCE_PATH}/ECSUtil" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/ECSUtil/res" "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/ecsutil/vcpkg.json b/ports/ecsutil/vcpkg.json index 9439868dd8..835190bebb 100644 --- a/ports/ecsutil/vcpkg.json +++ b/ports/ecsutil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ecsutil", "version": "1.0.7.15", - "port-version": 3, + "port-version": 4, "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", "supports": "windows & (x64 | x86) & !uwp", diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index 9636902af9..dced1beb25 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -9,12 +9,6 @@ vcpkg_from_github( if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(PLATFORM x86) - else() - set(PLATFORM x64) - endif() - # There is no debug configuration # As it is a C library, build the release configuration and copy its output to the debug folder set(VCPKG_BUILD_TYPE release) @@ -24,7 +18,7 @@ if(VCPKG_TARGET_IS_WINDOWS) INCLUDES_SUBPATH include LICENSE_SUBPATH LICENSE RELEASE_CONFIGURATION "Release - ANSI" - PLATFORM ${PLATFORM} + PLATFORM "${VCPKG_TARGET_ARCHITECTURE}" USE_VCPKG_INTEGRATION ALLOW_ROOT_INCLUDES) diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 2ed663e6c8..4dfa2695e7 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ocilib", "version": "4.7.5", + "port-version": 1, "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "license": "Apache-2.0", diff --git a/ports/rsasynccpp/portfile.cmake b/ports/rsasynccpp/portfile.cmake index 4fa5cbb810..db6090c761 100644 --- a/ports/rsasynccpp/portfile.cmake +++ b/ports/rsasynccpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO renestein/Rstein.AsyncCpp REF 0.0.7 - SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 + SHA512 b4cc1c68b6fc7bb8b418457ba18b834769abec07e44305955214f8918cc57f85c4258a0521ea55388fab3ec9724488e506d2b114c765b804991c38bf33133c55 HEAD_REF master ) @@ -26,20 +26,13 @@ else() endif() endif() -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(MSBUILD_PLATFORM "x86") -else () - set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH}) -endif() - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH RStein.AsyncCppLib.sln LICENSE_SUBPATH LICENSE - PLATFORM ${MSBUILD_PLATFORM} - DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} + PLATFORM "${TRIPLET_SYSTEM_ARCH}" + DEBUG_CONFIGURATION "${DEBUG_CONFIGURATION}" + RELEASE_CONFIGURATION "${RELEASE_CONFIGURATION}" ) file(COPY "${SOURCE_PATH}/RStein.AsyncCpp/" diff --git a/ports/rsasynccpp/vcpkg.json b/ports/rsasynccpp/vcpkg.json index b74ead2502..31091d0f92 100644 --- a/ports/rsasynccpp/vcpkg.json +++ b/ports/rsasynccpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsasynccpp", "version": "0.0.7", - "port-version": 1, + "port-version": 2, "maintainers": "Rene Stein ", "description": "Task Parallel Library (TPL)/dataflow/actors/async primitives for C++ based on C++ 20 coroutines.", "homepage": "https://github.com/renestein/Rstein.AsyncCpp", diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 91b62753b4..2737f91b7c 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -13,7 +13,6 @@ # VCPKG_TOOLCHAIN = ON OFF # TRIPLET_SYSTEM_ARCH = arm x86 x64 # BUILD_ARCH = "Win32" "x64" "ARM" -# MSBUILD_PLATFORM = "Win32"/"x64"/${TRIPLET_SYSTEM_ARCH} # DEBUG_CONFIG = "Debug Static" "Debug Dll" # RELEASE_CONFIG = "Release Static"" "Release DLL" # VCPKG_TARGET_IS_WINDOWS diff --git a/versions/3-/3fd.json b/versions/3-/3fd.json index a4398c8dfd..22d519d54d 100644 --- a/versions/3-/3fd.json +++ b/versions/3-/3fd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bfff492ed0b9ee3f31bb7593443572bc0fcf2d4", + "version": "2.6.3", + "port-version": 3 + }, { "git-tree": "3b52e6aff44ca4e11335754570701f692ea14184", "version": "2.6.3", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index f3bdede54a..6f62b3cab5 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df4ee7b5111a86e0bc99f45b39447bff68d102bd", + "version": "7.1.0", + "port-version": 1 + }, { "git-tree": "9a2a1876f2f625494b16da42b27ace343255d691", "version": "7.1.0", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 8ca379d726..8323b6cd77 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8cbff606d12daa3bf08a8fa623c2d524f1e05e5", + "version-semver": "3.9.5", + "port-version": 12 + }, { "git-tree": "8674469ca3e9968a8473861000056e09a190ced4", "version-semver": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index c0a1e1dc4f..ad96087834 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2,7 +2,7 @@ "default": { "3fd": { "baseline": "2.6.3", - "port-version": 2 + "port-version": 3 }, "7zip": { "baseline": "22.01", @@ -26,7 +26,7 @@ }, "ace": { "baseline": "7.1.0", - "port-version": 0 + "port-version": 1 }, "acl": { "baseline": "2.3.1", @@ -34,7 +34,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 11 + "port-version": 12 }, "ade": { "baseline": "0.1.1f", @@ -2230,7 +2230,7 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 5 + "port-version": 6 }, "easyloggingpp": { "baseline": "9.97.0", @@ -2254,7 +2254,7 @@ }, "ecsutil": { "baseline": "1.0.7.15", - "port-version": 3 + "port-version": 4 }, "edflib": { "baseline": "1.24", @@ -5718,7 +5718,7 @@ }, "ocilib": { "baseline": "4.7.5", - "port-version": 0 + "port-version": 1 }, "octomap": { "baseline": "1.9.6", @@ -7082,7 +7082,7 @@ }, "rsasynccpp": { "baseline": "0.0.7", - "port-version": 1 + "port-version": 2 }, "rsig": { "baseline": "0.1.1", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 4c770cc0e6..ccd0c73a9d 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8877642f19052e820932928a49049719516ebf9b", + "version": "2.7.7097.0", + "port-version": 6 + }, { "git-tree": "71b209c038081c700231ebc3be136c6976f22c4b", "version": "2.7.7097.0", diff --git a/versions/e-/ecsutil.json b/versions/e-/ecsutil.json index 2ca0f3a19e..1b4d83d19d 100644 --- a/versions/e-/ecsutil.json +++ b/versions/e-/ecsutil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1758edf3915aba62cd6eaf2c70d1401acf663175", + "version": "1.0.7.15", + "port-version": 4 + }, { "git-tree": "9526f049f789b79ac68f8937a9af15da13de53b4", "version": "1.0.7.15", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index b9f09c0c9d..2b27bb7791 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a48c5a6650bc58fdea2fe06d75c3347d89e483a", + "version": "4.7.5", + "port-version": 1 + }, { "git-tree": "e77dfc3008f996ea2defcaf771f46d33d81a4470", "version": "4.7.5", diff --git a/versions/r-/rsasynccpp.json b/versions/r-/rsasynccpp.json index fbd102a5de..1a1afbc268 100644 --- a/versions/r-/rsasynccpp.json +++ b/versions/r-/rsasynccpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44c0663e6c7ee48730c4db3336c455e1e45c473a", + "version": "0.0.7", + "port-version": 2 + }, { "git-tree": "7fc33d5002210774c5e4d7450a0cd88c3be82ca8", "version": "0.0.7",