From c35a66145ea89efdebe72fa716196d1620eea1a2 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 5 Jul 2021 00:59:39 -0700 Subject: [PATCH 01/25] [yasm/yasm-tool] Remove port yasm-tool --- ports/yasm-tool-helper/vcpkg.json | 5 +- ports/yasm-tool/portfile.cmake | 47 ------------------- ports/yasm-tool/vcpkg.json | 7 --- ports/yasm/CONTROL | 5 -- ports/yasm/portfile.cmake | 42 ++++++----------- .../vcpkg-port-config.cmake.in | 6 +-- ports/yasm/vcpkg.json | 8 ++++ versions/baseline.json | 4 -- versions/y-/yasm-tool.json | 14 ------ 9 files changed, 26 insertions(+), 112 deletions(-) delete mode 100644 ports/yasm-tool/portfile.cmake delete mode 100644 ports/yasm-tool/vcpkg.json delete mode 100644 ports/yasm/CONTROL rename ports/{yasm-tool => yasm}/vcpkg-port-config.cmake.in (81%) create mode 100644 ports/yasm/vcpkg.json delete mode 100644 versions/y-/yasm-tool.json diff --git a/ports/yasm-tool-helper/vcpkg.json b/ports/yasm-tool-helper/vcpkg.json index 72e1fba3bd2de2..70cdc6c69cbd74 100644 --- a/ports/yasm-tool-helper/vcpkg.json +++ b/ports/yasm-tool-helper/vcpkg.json @@ -1,11 +1,12 @@ { "name": "yasm-tool-helper", "version-string": "2020-03-11", - "description": "Backfill that depends on yasm-tool:host", + "port-version": 1, + "description": "Backfill that depends on yasm:host", "homepage": "https://github.com/Microsoft/vcpkg", "dependencies": [ { - "name": "yasm-tool", + "name": "yasm", "host": true } ] diff --git a/ports/yasm-tool/portfile.cmake b/ports/yasm-tool/portfile.cmake deleted file mode 100644 index d4949bc9c2ff04..00000000000000 --- a/ports/yasm-tool/portfile.cmake +++ /dev/null @@ -1,47 +0,0 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -if(VCPKG_TARGET_IS_WINDOWS) - set(YASM_BUILD_BINARY ON) - set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) - set(VCPKG_LIBRARY_LINKAGE static) - - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO yasm/yasm - REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 - SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c - ) - - file(INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) - foreach(LICENSE Artistic.txt BSD.txt GNU_GPL-2.0 GNU_LGPL-2.0) - file(COPY "${SOURCE_PATH}/${LICENSE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - endforeach() - - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_NLS=OFF - -DYASM_BUILD_TESTS=OFF - ) - vcpkg_install_cmake() - - vcpkg_copy_tools(TOOL_NAMES yasm) - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") -else() - set(YASM_BUILD_BINARY OFF) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake.in" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) diff --git a/ports/yasm-tool/vcpkg.json b/ports/yasm-tool/vcpkg.json deleted file mode 100644 index a3552faaa69c60..00000000000000 --- a/ports/yasm-tool/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "yasm-tool", - "version": "1.3.0", - "description": "A modular assembler.", - "homepage": "http://yasm.tortall.net/", - "supports": "native & !uwp" -} diff --git a/ports/yasm/CONTROL b/ports/yasm/CONTROL deleted file mode 100644 index bdcaaea9f46e88..00000000000000 --- a/ports/yasm/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: yasm -Version: 1.3.0 -Homepage: https://github.com/yasm/yasm -Description: Yasm is a complete rewrite of the NASM assembler under the “new” BSD License. -Supports: windows & !uwp & !arm \ No newline at end of file diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 75090b3713837d..118c93676efa3b 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -1,49 +1,35 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "${PORT} only supports windows") -elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm") - message(FATAL_ERROR "ARM is currently not supported.") -elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Error: UWP builds are currently not supported.") -endif() +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yasm/yasm - REF v1.3.0 - SHA512 f5053e2012e0d2ce88cc1cc06e3bdb501054aed5d1f78fae40bb3e676fe2eb9843d335a612d7614d99a2b9e49dca998d57f61b0b89fac8225afa4ae60ae848f1 + REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 + SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c HEAD_REF master ) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON_PATH ${PYTHON2} DIRECTORY) -vcpkg_add_to_path("${PYTHON_PATH}") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DENABLE_NLS=OFF + -DYASM_BUILD_TESTS=OFF ) vcpkg_install_cmake() -file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/bin/vsyasm.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/yasm.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/ytasm.exe -) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vsyasm.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/vsyasm.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/yasm.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/yasm.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ytasm.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/ytasm.exe) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(EXTRA_OPTION yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) endif() +vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm DYNAMIC_DEPENS ${EXTRA_OPTION} AUTO_CLEAN) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/yasm-tool/vcpkg-port-config.cmake.in b/ports/yasm/vcpkg-port-config.cmake.in similarity index 81% rename from ports/yasm-tool/vcpkg-port-config.cmake.in rename to ports/yasm/vcpkg-port-config.cmake.in index 5abe7520aca905..59a9efc79865f4 100644 --- a/ports/yasm-tool/vcpkg-port-config.cmake.in +++ b/ports/yasm/vcpkg-port-config.cmake.in @@ -11,11 +11,7 @@ function(yasm_tool_helper) message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}") endif() - if(@YASM_BUILD_BINARY@) - set(YASM "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm-tool/yasm.exe") - else() - vcpkg_find_acquire_program(YASM) - endif() + find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm-tool") if(arg_APPEND_TO_PATH) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json new file mode 100644 index 00000000000000..9265f70f59cbe0 --- /dev/null +++ b/ports/yasm/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "yasm", + "version-semver": "1.3.0", + "port-version": 1, + "description": "Yasm is a complete rewrite of the NASM assembler under the “new” BSD License.", + "homepage": "https://github.com/yasm/yasm", + "supports": "!uwp" +} diff --git a/versions/baseline.json b/versions/baseline.json index a200b7aee8824e..a8398f7d150e2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6784,10 +6784,6 @@ "baseline": "1.3.0", "port-version": 0 }, - "yasm-tool": { - "baseline": "1.3.0", - "port-version": 0 - }, "yasm-tool-helper": { "baseline": "2020-03-11", "port-version": 0 diff --git a/versions/y-/yasm-tool.json b/versions/y-/yasm-tool.json deleted file mode 100644 index 3ae9fc64031da7..00000000000000 --- a/versions/y-/yasm-tool.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "versions": [ - { - "git-tree": "cb913a26c18cde98be038655f65d2363ecee2cc1", - "version": "1.3.0", - "port-version": 0 - }, - { - "git-tree": "40cca1c50553ac0d87c91af9c0125d8f3e6e8a09", - "version-string": "2020-10-12", - "port-version": 0 - } - ] -} From 105a82a1bfbd5773fabfac7ca600f7a5e5b9e1ca Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 5 Jul 2021 01:01:29 -0700 Subject: [PATCH 02/25] [vcpkg_copy_tools/vcpkg_copy_tool_dependencies] Add option DYNAMIC_DEPENS --- .../cmake/vcpkg_copy_tool_dependencies.cmake | 24 ++++++++++++++++--- scripts/cmake/vcpkg_copy_tools.cmake | 10 +++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 0cb0bbcefbf48d..7c5885a507c21b 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -5,11 +5,17 @@ Copy all DLL dependencies of built tools into the tool folder. ## Usage ```cmake -vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>) +vcpkg_copy_tool_dependencies( + TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}> + [DYNAMIC_DEPENS ...] +) ``` -## Parameters +## TOOL_DIR The path to the directory containing the tools. +### DYNAMIC_DEPENS +A list of tool’s dynamic dependency library names. + ## Notes This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. @@ -20,6 +26,7 @@ This command should always be called by portfiles after they have finished rearr #]===] function(vcpkg_copy_tool_dependencies TOOL_DIR) + cmake_parse_arguments(PARSE_ARGV 0 _vctd "" "TOOL_DIR" "DYNAMIC_DEPENS") if (VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_EXE pwsh) if (NOT PWSH_EXE) @@ -29,7 +36,7 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR) message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.") endif() macro(search_for_dependencies PATH_TO_SEARCH) - file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll" "${TOOL_DIR}/*.pyd") + file(GLOB TOOLS "${_vctd_TOOL_DIR}/*.exe" "${_vctd_TOOL_DIR}/*.dll" "${_vctd_TOOL_DIR}/*.pyd") foreach(TOOL IN LISTS TOOLS) vcpkg_execute_required_process( COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo @@ -43,5 +50,16 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR) endmacro() search_for_dependencies("${CURRENT_PACKAGES_DIR}/bin") search_for_dependencies("${CURRENT_INSTALLED_DIR}/bin") + + if (_vctd_DYNAMIC_DEPENS) + foreach (SEARCH_ITEM ${_vctd_DYNAMIC_DEPENS}) + if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM}") + debug_message("Copying file ${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM} to ${_vctd_TOOL_DIR}") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM}" DESTINATION "${_vctd_TOOL_DIR}") + else() + message(WARNING "Dynamic dependency ${SEARCH_ITEM} not found in ${CURRENT_PACKAGES_DIR}/bin.") + endif() + endforeach() + endif() endif() endfunction() diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index 18ddc3715d9a61..7991af3243a520 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -9,6 +9,7 @@ vcpkg_copy_tools( TOOL_NAMES ... [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] + [DYNAMIC_DEPENS ...] [AUTO_CLEAN] ) ``` @@ -22,6 +23,9 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P ### DESTINATION Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. +### DYNAMIC_DEPENS +A list of tool’s dynamic dependency library names. + ### AUTO_CLEAN Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. @@ -34,7 +38,7 @@ Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_ function(vcpkg_copy_tools) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vct "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES") + cmake_parse_arguments(PARSE_ARGV 0 _vct "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES;DYNAMIC_DEPENS") if(NOT DEFINED _vct_TOOL_NAMES) message(FATAL_ERROR "TOOL_NAMES must be specified.") @@ -63,9 +67,9 @@ function(vcpkg_copy_tools) endif() endforeach() + vcpkg_copy_tool_dependencies(TOOL_DIR "${_vct_DESTINATION}" DYNAMIC_DEPENS "${_vct_DYNAMIC_DEPENS}") + if(_vct_AUTO_CLEAN) vcpkg_clean_executables_in_bin(FILE_NAMES ${_vct_TOOL_NAMES}) endif() - - vcpkg_copy_tool_dependencies("${_vct_DESTINATION}") endfunction() From c8ab16de29fbd8726884f35c1b33356824413eb7 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 5 Jul 2021 01:02:48 -0700 Subject: [PATCH 03/25] [gmp] Switch dependency yasm-tool to yasm --- ports/gmp/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 3f9b609b33b19b..6b539cb20f5c1e 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version-string": "6.2.1", - "port-version": 6, + "port-version": 7, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", @@ -12,7 +12,7 @@ "platform": "windows" }, { - "name": "yasm-tool", + "name": "yasm", "host": true, "platform": "windows" } From 40497a65b0aa6295b30185ab8f6724e7fe4df093 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 5 Jul 2021 01:15:58 -0700 Subject: [PATCH 04/25] Update docs --- docs/maintainers/vcpkg_copy_tool_dependencies.md | 10 ++++++++-- docs/maintainers/vcpkg_copy_tools.md | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index d34fa5d602c040..2270bea789f474 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -6,11 +6,17 @@ Copy all DLL dependencies of built tools into the tool folder. ## Usage ```cmake -vcpkg_copy_tool_dependencies(<${CURRENT_PACKAGES_DIR}/tools/${PORT}>) +vcpkg_copy_tool_dependencies( + TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}> + [DYNAMIC_DEPENS ...] +) ``` -## Parameters +## TOOL_DIR The path to the directory containing the tools. +### DYNAMIC_DEPENS +A list of tools dynamic dependency library names. + ## Notes This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. diff --git a/docs/maintainers/vcpkg_copy_tools.md b/docs/maintainers/vcpkg_copy_tools.md index aa9c0735cb97a4..3e08c79194c43f 100644 --- a/docs/maintainers/vcpkg_copy_tools.md +++ b/docs/maintainers/vcpkg_copy_tools.md @@ -10,6 +10,7 @@ vcpkg_copy_tools( TOOL_NAMES ... [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] + [DYNAMIC_DEPENS ...] [AUTO_CLEAN] ) ``` @@ -23,6 +24,9 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P ### DESTINATION Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. +### DYNAMIC_DEPENS +A list of tools dynamic dependency library names. + ### AUTO_CLEAN Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. From 3eda1b78750bfeea412d309eae84744808bcbec7 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 5 Jul 2021 01:21:43 -0700 Subject: [PATCH 05/25] update docs --- docs/maintainers/vcpkg_copy_tool_dependencies.md | 2 +- docs/maintainers/vcpkg_copy_tools.md | 2 +- scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 2 +- scripts/cmake/vcpkg_copy_tools.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index 2270bea789f474..ed637c9eecf90d 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -15,7 +15,7 @@ vcpkg_copy_tool_dependencies( The path to the directory containing the tools. ### DYNAMIC_DEPENS -A list of tools dynamic dependency library names. +A list of tool's dynamic dependency library names. ## Notes This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. diff --git a/docs/maintainers/vcpkg_copy_tools.md b/docs/maintainers/vcpkg_copy_tools.md index 3e08c79194c43f..bddae6548e7409 100644 --- a/docs/maintainers/vcpkg_copy_tools.md +++ b/docs/maintainers/vcpkg_copy_tools.md @@ -25,7 +25,7 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ### DYNAMIC_DEPENS -A list of tools dynamic dependency library names. +A list of tool's dynamic dependency library names. ### AUTO_CLEAN Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 7c5885a507c21b..b3e283525e76b3 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -14,7 +14,7 @@ vcpkg_copy_tool_dependencies( The path to the directory containing the tools. ### DYNAMIC_DEPENS -A list of tool’s dynamic dependency library names. +A list of tool's dynamic dependency library names. ## Notes This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index 7991af3243a520..ddc6b7855e02d5 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -24,7 +24,7 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ### DYNAMIC_DEPENS -A list of tool’s dynamic dependency library names. +A list of tool's dynamic dependency library names. ### AUTO_CLEAN Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. From 75f540e7150eb9684d024dc2acea70ce31230da8 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Mon, 5 Jul 2021 02:31:00 -0700 Subject: [PATCH 06/25] Add keyword TOOL_DIR to all used ports --- ports/alac-decoder/CONTROL | 2 +- ports/alac-decoder/portfile.cmake | 2 +- ports/alac/CONTROL | 3 ++- ports/alac/portfile.cmake | 2 +- ports/alembic/CONTROL | 1 + ports/alembic/portfile.cmake | 2 +- ports/aubio/portfile.cmake | 2 +- ports/aubio/vcpkg.json | 2 +- ports/basisu/CONTROL | 3 ++- ports/basisu/portfile.cmake | 2 +- ports/boringssl/portfile.cmake | 2 +- ports/boringssl/vcpkg.json | 1 + ports/botan/portfile.cmake | 2 +- ports/botan/vcpkg.json | 2 +- ports/brotli/CONTROL | 2 +- ports/brotli/portfile.cmake | 2 +- ports/butteraugli/CONTROL | 3 ++- ports/butteraugli/portfile.cmake | 2 +- ports/cgns/CONTROL | 3 ++- ports/cgns/portfile.cmake | 4 ++-- ports/chakracore/portfile.cmake | 2 +- ports/chakracore/vcpkg.json | 2 +- ports/cmark/CONTROL | 3 ++- ports/cmark/portfile.cmake | 2 +- ports/crashrpt/CONTROL | 1 + ports/crashrpt/portfile.cmake | 2 +- ports/cutelyst2/CONTROL | 1 + ports/cutelyst2/portfile.cmake | 2 +- ports/fdk-aac/portfile.cmake | 2 +- ports/fdk-aac/vcpkg.json | 1 + ports/flatbuffers/CONTROL | 2 +- ports/flatbuffers/portfile.cmake | 2 +- ports/foonathan-memory/CONTROL | 3 ++- ports/foonathan-memory/portfile.cmake | 2 +- ports/freerdp/portfile.cmake | 2 +- ports/freerdp/vcpkg.json | 2 +- ports/geographiclib/portfile.cmake | 2 +- ports/geographiclib/vcpkg.json | 1 + ports/gettext/portfile.cmake | 4 ++-- ports/gettext/vcpkg.json | 2 +- ports/guetzli/CONTROL | 3 ++- ports/guetzli/portfile.cmake | 2 +- ports/hdf5/portfile.cmake | 2 +- ports/hdf5/vcpkg.json | 2 +- ports/hunspell/portfile.cmake | 2 +- ports/hunspell/vcpkg.json | 2 +- ports/irrlicht/CONTROL | 3 ++- ports/irrlicht/portfile.cmake | 2 +- ports/ismrmrd/CONTROL | 1 + ports/ismrmrd/portfile.cmake | 2 +- ports/jsonnet/CONTROL | 2 +- ports/jsonnet/portfile.cmake | 2 +- ports/kf5config/portfile.cmake | 2 +- ports/kf5config/vcpkg.json | 2 +- ports/ktx/portfile.cmake | 2 +- ports/ktx/vcpkg.json | 2 +- ports/lcm/portfile.cmake | 2 +- ports/lcm/vcpkg.json | 2 +- ports/libdatrie/CONTROL | 3 ++- ports/libdatrie/portfile.cmake | 2 +- ports/libiconv/CONTROL | 2 +- ports/libiconv/portfile.cmake | 4 ++-- ports/liblemon/CONTROL | 3 ++- ports/liblemon/portfile.cmake | 2 +- ports/liblinear/CONTROL | 1 + ports/liblinear/portfile.cmake | 2 +- ports/liblo/CONTROL | 1 + ports/liblo/portfile.cmake | 2 +- ports/libmagic/portfile.cmake | 4 ++-- ports/libmagic/vcpkg.json | 1 + ports/libopenmpt/portfile.cmake | 2 +- ports/libopenmpt/vcpkg.json | 2 +- ports/libpq/portfile.cmake | 4 ++-- ports/libpq/vcpkg.json | 2 +- ports/libqrencode/CONTROL | 1 + ports/libqrencode/portfile.cmake | 2 +- ports/libressl/portfile.cmake | 2 +- ports/libressl/vcpkg.json | 1 + ports/libudis86/portfile.cmake | 2 +- ports/libudis86/vcpkg.json | 2 +- ports/libwebp/CONTROL | 2 +- ports/libwebp/portfile.cmake | 2 +- ports/llvm/portfile.cmake | 2 +- ports/llvm/vcpkg.json | 1 + ports/lua/portfile.cmake | 2 +- ports/lua/vcpkg.json | 2 +- ports/luajit/CONTROL | 3 ++- ports/luajit/portfile.cmake | 2 +- ports/mathgl/CONTROL | 3 ++- ports/mathgl/portfile.cmake | 2 +- ports/minizip/portfile.cmake | 2 +- ports/minizip/vcpkg.json | 2 +- ports/monkeys-audio/CONTROL | 1 + ports/monkeys-audio/portfile.cmake | 2 +- ports/moos-ui/CONTROL | 3 ++- ports/moos-ui/portfile.cmake | 2 +- ports/opencc/CONTROL | 2 +- ports/opencc/portfile.cmake | 2 +- ports/openexr/portfile.cmake | 2 +- ports/openexr/vcpkg.json | 2 +- ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 2 +- ports/paraview/CONTROL | 2 +- ports/paraview/portfile.cmake | 2 +- ports/pcl/portfile.cmake | 2 +- ports/pcl/vcpkg.json | 2 +- ports/pdal/CONTROL | 2 +- ports/pdal/portfile.cmake | 2 +- ports/pmdk/CONTROL | 1 + ports/pmdk/portfile.cmake | 2 +- ports/python3/portfile.cmake | 2 +- ports/python3/vcpkg.json | 2 +- ports/qt5-base/cmake/qt_build_submodule.cmake | 4 ++-- ports/qt5-base/portfile.cmake | 6 +++--- ports/qt5-base/vcpkg.json | 2 +- ports/realsense2/portfile.cmake | 2 +- ports/realsense2/vcpkg.json | 2 +- ports/rtlsdr/CONTROL | 3 ++- ports/rtlsdr/portfile.cmake | 2 +- ports/sassc/CONTROL | 2 +- ports/sassc/portfile.cmake | 2 +- ports/sf2cute/CONTROL | 3 ++- ports/sf2cute/portfile.cmake | 2 +- ports/shapelib/CONTROL | 1 + ports/shapelib/portfile.cmake | 2 +- ports/sqlcipher/portfile.cmake | 2 +- ports/sqlcipher/vcpkg.json | 1 + ports/stxxl/CONTROL | 3 ++- ports/stxxl/portfile.cmake | 2 +- ports/tgui/portfile.cmake | 2 +- ports/tgui/vcpkg.json | 2 +- ports/thrift/CONTROL | 1 + ports/thrift/portfile.cmake | 2 +- ports/tidy-html5/CONTROL | 3 ++- ports/tidy-html5/portfile.cmake | 2 +- ports/uchardet/CONTROL | 1 + ports/uchardet/portfile.cmake | 2 +- ports/vtk/CONTROL | 2 +- ports/vtk/portfile.cmake | 2 +- ports/woff2/CONTROL | 5 +++-- ports/woff2/portfile.cmake | 2 +- ports/zopfli/CONTROL | 1 + ports/zopfli/portfile.cmake | 2 +- ports/zxing-cpp/CONTROL | 1 + ports/zxing-cpp/portfile.cmake | 2 +- 145 files changed, 172 insertions(+), 133 deletions(-) diff --git a/ports/alac-decoder/CONTROL b/ports/alac-decoder/CONTROL index e9bc6f606c046b..2427e16e05b5cb 100644 --- a/ports/alac-decoder/CONTROL +++ b/ports/alac-decoder/CONTROL @@ -1,5 +1,5 @@ Source: alac-decoder Version: 0.2 -Port-Version: 4 +Port-Version: 5 Homepage: https://distfiles.macports.org/alac_decoder Description: ALAC C implementation of a decoder, written from reverse engineering the file format diff --git a/ports/alac-decoder/portfile.cmake b/ports/alac-decoder/portfile.cmake index 15c8152b35371f..c19067ddfbfc15 100644 --- a/ports/alac-decoder/portfile.cmake +++ b/ports/alac-decoder/portfile.cmake @@ -27,6 +27,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/alac/CONTROL b/ports/alac/CONTROL index 7938d6b7144dbf..3deb7c524a2223 100644 --- a/ports/alac/CONTROL +++ b/ports/alac/CONTROL @@ -1,5 +1,6 @@ Source: alac -Version: 2017-11-03-c38887c5-1 +Version: 2017-11-03-c38887c5 +Port-Version: 2 Homepage: https://github.com/macosforge/alac Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices. Supports: !uwp \ No newline at end of file diff --git a/ports/alac/portfile.cmake b/ports/alac/portfile.cmake index d9dd83141e7dc4..4d0ff027bfb18e 100644 --- a/ports/alac/portfile.cmake +++ b/ports/alac/portfile.cmake @@ -22,5 +22,5 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/alac) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac RENAME copyright) diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 333445866e94bd..18d25642d4eacc 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,5 +1,6 @@ Source: alembic Version: 1.7.16 +Port-Version: 1 Build-Depends: ilmbase, hdf5 Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. Homepage: https://alembic.io/ diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 60199e30ca85e8..376220bc01b0a3 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -67,6 +67,6 @@ else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 4cb7f7f6c9b423..31b1cc055afccc 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -38,5 +38,5 @@ file(COPY ${CURRENT_PACKAGES_DIR}/share/${PORT}) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index bb9e7eda597023..c9404444c33321 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 6, + "port-version": 7, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "default-features": [ diff --git a/ports/basisu/CONTROL b/ports/basisu/CONTROL index a690f6dbdac128..59a0b91ff1d2cd 100644 --- a/ports/basisu/CONTROL +++ b/ports/basisu/CONTROL @@ -1,5 +1,6 @@ Source: basisu -Version: 1.11-4 +Version: 1.11 +Port-Version: 5 Homepage: https://github.com/BinomialLLC/basis_universal Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. Build-Depends: lodepng diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake index 8873c52fc51344..b653bb2ed59339 100644 --- a/ports/basisu/portfile.cmake +++ b/ports/basisu/portfile.cmake @@ -26,7 +26,7 @@ endif() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/basisu) # Remove unnecessary files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index 71cef4ed35058f..4ba6cb5d7aee25 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -45,7 +45,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/boringssl") endif() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index e3aaec032fd75d..d8d9f7ac2d8fb8 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boringssl", "version-date": "2021-06-23", + "port-version": 1, "description": "BoringSSl is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index cee4a0e2722125..73f15fc20e9f6f 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -146,7 +146,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/botan) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/botan) file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan-${BOTAN_VERSION}/ ${CURRENT_PACKAGES_DIR}/share/botan/) file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan/license.txt ${CURRENT_PACKAGES_DIR}/share/botan/copyright) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 48b62c95c10298..0dbf7567dcaba4 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.16.0", - "port-version": 1, + "port-version": 2, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL index 93d89044460740..61508a4bd7df6a 100644 --- a/ports/brotli/CONTROL +++ b/ports/brotli/CONTROL @@ -1,5 +1,5 @@ Source: brotli Version: 1.0.9 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/google/brotli Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling. diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 9c1e3037dc5184..da799c6a4f7afb 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -21,7 +21,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/brotli) vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli) vcpkg_fixup_pkgconfig() diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL index aab641738f881a..bab879b8123c02 100644 --- a/ports/butteraugli/CONTROL +++ b/ports/butteraugli/CONTROL @@ -1,5 +1,6 @@ Source: butteraugli -Version: 2019-05-08-1 +Version: 2019-05-08 +Port-Version: 2 Homepage: https://github.com/google/butteraugli Description: butteraugli estimates the psychovisual difference between two images Build-Depends: libpng, libjpeg-turbo diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake index 26ff21e4282de3..3161d0b6928cf1 100644 --- a/ports/butteraugli/portfile.cmake +++ b/ports/butteraugli/portfile.cmake @@ -21,6 +21,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL index 3398bad14fdf49..af026b13f1bec4 100644 --- a/ports/cgns/CONTROL +++ b/ports/cgns/CONTROL @@ -1,5 +1,6 @@ Source: cgns -Version: 3.4.0-1 +Version: 3.4.0 +Port-Version: 2 Homepage: http://cgns.org/ Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. Default-Features: hdf5, lfsselector diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 89544674496be3..9224291f64c833 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -61,7 +61,7 @@ foreach(tool ${TOOLS}) endif() endforeach() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) IF(EXISTS ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/debug/include/cgnsconfig.h) @@ -70,7 +70,7 @@ endif() file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) file(GLOB_RECURSE BATCH_FILES ${CURRENT_PACKAGES_DIR}/bin/*.bat) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 991e3a3de194d9..552bb09c2120b6 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -63,7 +63,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/chakracore) endif() vcpkg_copy_pdbs() diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 5c6426d7d57f1d..3683c17f70acf5 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chakracore", "version-string": "1.11.22", - "port-version": 1, + "port-version": 2, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", "supports": "windows & !uwp & !static" diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL index 8528ca5793954b..cf43f998472525 100644 --- a/ports/cmark/CONTROL +++ b/ports/cmark/CONTROL @@ -1,3 +1,4 @@ Source: cmark -Version: 0.29.0 +Version: 0.29.0 +Port-Version: 1 Description: CommonMark parsing and rendering library diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake index 73044e5da2efcc..ea45b95d9aac08 100644 --- a/ports/cmark/portfile.cmake +++ b/ports/cmark/portfile.cmake @@ -32,7 +32,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark.exe) file(COPY ${CURRENT_PACKAGES_DIR}/bin/cmark.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cmark/) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cmark) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/cmark) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark) diff --git a/ports/crashrpt/CONTROL b/ports/crashrpt/CONTROL index 4b15e9d2336243..6c6f31674927e4 100644 --- a/ports/crashrpt/CONTROL +++ b/ports/crashrpt/CONTROL @@ -1,5 +1,6 @@ Source: crashrpt Version: 1.4.3 +Port-Version: 1 Description: A crash reporting system for Windows applications Homepage: http://crashrpt.sourceforge.net/ Build-Depends: dbghelp, libjpeg-turbo, libogg, libpng, libtheora, tinyxml, wtl, zlib diff --git a/ports/crashrpt/portfile.cmake b/ports/crashrpt/portfile.cmake index f52f8e19a24b8f..82f76456621b43 100644 --- a/ports/crashrpt/portfile.cmake +++ b/ports/crashrpt/portfile.cmake @@ -46,7 +46,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL index 56155853848ded..60b1093e2ddb55 100644 --- a/ports/cutelyst2/CONTROL +++ b/ports/cutelyst2/CONTROL @@ -1,4 +1,5 @@ Source: cutelyst2 Version: 2.12.0 +Port-Version: 1 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework Build-Depends: qt5-base[core] diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake index 98d84ed31f020e..676e0152e6bad5 100644 --- a/ports/cutelyst2/portfile.cmake +++ b/ports/cutelyst2/portfile.cmake @@ -30,7 +30,7 @@ file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/cutelyst2 ${CURRENT_PACKA if(EXES OR DEBUG_EXES) file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cutelyst2) file(REMOVE ${EXES} ${DEBUG_EXES}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cutelyst2) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/cutelyst2) endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cutelyst2-plugins/ActionREST.dll) diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake index 5a6119724e390b..1a0afdf16ef773 100644 --- a/ports/fdk-aac/portfile.cmake +++ b/ports/fdk-aac/portfile.cmake @@ -18,6 +18,6 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fdk-aac/vcpkg.json b/ports/fdk-aac/vcpkg.json index 4f3cbf7233637e..820dc668f2f793 100644 --- a/ports/fdk-aac/vcpkg.json +++ b/ports/fdk-aac/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fdk-aac", "version-semver": "2.0.2", + "port-version": 1, "description": "A standalone library of the Fraunhofer FDK AAC code", "homepage": "https://github.com/mstorsjo/fdk-aac" } diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index ced25eb94c3c45..c8b36132709894 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,6 +1,6 @@ Source: flatbuffers Version: 1.12.0 -Port-Version: 2 +Port-Version: 3 Description: Memory Efficient Serialization Library FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. Homepage: https://google.github.io/flatbuffers/ diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index 794592d98379d2..6a423836adf6c7 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -40,7 +40,7 @@ if(flatc_path) ${flatc_path} ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable} ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/flatbuffers) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/flatbuffers) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/foonathan-memory/CONTROL b/ports/foonathan-memory/CONTROL index 8c105a104de5db..f4f7e7de94d5ef 100644 --- a/ports/foonathan-memory/CONTROL +++ b/ports/foonathan-memory/CONTROL @@ -1,5 +1,6 @@ Source: foonathan-memory -Version: 2019-07-21-1 +Version: 2019-07-21 +Port-Version: 2 Description: STL compatible C++ memory allocator library Homepage: https://foonathan.net/doc/memory/ Default-Features: tool diff --git a/ports/foonathan-memory/portfile.cmake b/ports/foonathan-memory/portfile.cmake index 170eb43692f439..e6eeea06d4d1d6 100644 --- a/ports/foonathan-memory/portfile.cmake +++ b/ports/foonathan-memory/portfile.cmake @@ -106,7 +106,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX}) ${CURRENT_PACKAGES_DIR}/bin/nodesize_dbg${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 3fb58548c26415..03f7d6dd603fb0 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -55,7 +55,7 @@ if(TOOLS_RELEASE) file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG}) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB_RECURSE FREERDP_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 0c6a5bfb88516e..b561fe8ded7e47 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freerdp", "version-semver": "2.2.0", - "port-version": 1, + "port-version": 2, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "supports": "!(arm | uwp)", diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 3b7bd3f51fa256..5a10a3ca57e66d 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -39,7 +39,7 @@ vcpkg_fixup_cmake_targets (CONFIG_PATH share/geographiclib) vcpkg_copy_pdbs () if (tools IN_LIST FEATURES) - vcpkg_copy_tool_dependencies (${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif () file (REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index df18eaf32021b4..69c49bc99c4e3e 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geographiclib", "version": "1.52", + "port-version": 1, "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index a595a6d275ed71..d9d1913275e8f1 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -72,8 +72,8 @@ vcpkg_install_make(${ADDITIONAL_INSTALL_OPTIONS}) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettext) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gettext/COPYING ${CURRENT_PACKAGES_DIR}/share/gettext/copyright) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index 57cb5439a9f2a2..7b166e22f2df24 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 3, + "port-version": 4, "description": "The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/ports/guetzli/CONTROL b/ports/guetzli/CONTROL index 142789bbd0129d..991f8bb50926cd 100644 --- a/ports/guetzli/CONTROL +++ b/ports/guetzli/CONTROL @@ -1,5 +1,6 @@ Source: guetzli -Version: 2020-09-14 +Version: 2020-09-14 +Port-Version: 1 Homepage: https://github.com/google/guetzli Description: Perceptual JPEG encoder Build-Depends: libpng, butteraugli diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake index d2260241845425..53ad4bd6af6e0e 100644 --- a/ports/guetzli/portfile.cmake +++ b/ports/guetzli/portfile.cmake @@ -20,6 +20,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/guetzli) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/guetzli) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/guetzli RENAME copyright) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 0cd1cb52c1b428..c6217245dddf6e 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -146,7 +146,7 @@ if(FEATURES MATCHES "tools") endif() endforeach() endforeach() - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 1cb6985d5b5af7..3912a629ea26c9 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.0", - "port-version": 3, + "port-version": 4, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index bf48b9c2eaf0aa..a0ac903248c37a 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -72,7 +72,7 @@ else() vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") vcpkg_fixup_pkgconfig() endif() vcpkg_copy_pdbs() diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 372bac8dcee9e1..c89c4ca94ac102 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hunspell", "version": "1.7.0", - "port-version": 4, + "port-version": 5, "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", "supports": "!((arm | uwp) & windows)", diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index e8ff45bdd81fd5..0ca6bc9faa4dc0 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -1,5 +1,6 @@ Source: irrlicht -Version: 1.8.4-10 +Version: 1.8.4 +Port-Version: 11 Homepage: http://irrlicht.sourceforge.net Description: Irrlicht lightning fast 3d engine Build-Depends: zlib, libpng, bzip2, libjpeg-turbo diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 754119f3ed9ec2..d100aac98c4050 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -34,7 +34,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets() if("tools" IN_LIST FEATURES) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/irrlicht/) endif() file(WRITE ${CURRENT_PACKAGES_DIR}/share/irrlicht/irrlicht-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/irrlicht-targets.cmake)") diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL index 2fc4c5d1463087..9e2d9c755a6ebb 100644 --- a/ports/ismrmrd/CONTROL +++ b/ports/ismrmrd/CONTROL @@ -1,5 +1,6 @@ Source: ismrmrd Version: 1.5.0 +Port-Version: 1 Description: ISMRM Raw Data Format Build-Depends: pugixml, hdf5, boost, fftw3 Homepage: https://github.com/ismrmrd/ismrmrd \ No newline at end of file diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake index ee5a0f962e7bc2..7681c22d405d4d 100644 --- a/ports/ismrmrd/portfile.cmake +++ b/ports/ismrmrd/portfile.cmake @@ -71,4 +71,4 @@ endif() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd) \ No newline at end of file +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/ismrmrd) \ No newline at end of file diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index 0708225310efb1..25feaefbe459ef 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,6 +1,6 @@ Source: jsonnet Version: 0.16.0 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/google/jsonnet Description: Jsonnet - The data templating language Build-Depends: nlohmann-json diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 6542aba75df895..d07a71318fc94b 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -52,7 +52,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/jsonnet) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/jsonnet) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 0d6853b855155a..c1272737fe33cc 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -37,7 +37,7 @@ endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") vcpkg_copy_pdbs() diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 734d45abadf768..6962f5929d8878 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5config", "version": "5.81.0", - "port-version": 1, + "port-version": 2, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index c5cbe1f99cfb8a..190c365e3311e6 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -62,7 +62,7 @@ if(tools IN_LIST FEATURES) ktx2check AUTO_CLEAN ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx TARGET_PATH share/${PORT}) diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index 42d06e8ee92b3a..5c82f077c51a34 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ktx", "version-string": "4.0.0-beta5", - "port-version": 2, + "port-version": 3, "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", "supports": "!(uwp | x86)", diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake index 74bca46d300d8c..41185cb6bfce02 100644 --- a/ports/lcm/portfile.cmake +++ b/ports/lcm/portfile.cmake @@ -51,7 +51,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lcm) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/lcm) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/lcm/vcpkg.json b/ports/lcm/vcpkg.json index ec04fd87b91c52..18cb5b5f54a809 100644 --- a/ports/lcm/vcpkg.json +++ b/ports/lcm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcm", "version": "1.4.0", - "port-version": 2, + "port-version": 3, "description": [ "Lightweight Communications and Marshalling (LCM)", "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." diff --git a/ports/libdatrie/CONTROL b/ports/libdatrie/CONTROL index ddcdf9972eb6e4..e9f45a85d54ba7 100644 --- a/ports/libdatrie/CONTROL +++ b/ports/libdatrie/CONTROL @@ -1,5 +1,6 @@ Source: libdatrie -Version: 0.2.10-3 +Version: 0.2.10 +Port-Version: 4 Homepage: https://linux.thai.net/pub/ThaiLinux/software/libthai Description: implementation of double-array structure for representing trie Build-Depends: libiconv diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake index 452b66a174f692..c55a10ae64bf3a 100644 --- a/ports/libdatrie/portfile.cmake +++ b/ports/libdatrie/portfile.cmake @@ -42,7 +42,7 @@ vcpkg_copy_pdbs() if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/trietool.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/trietool.exe) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index f7414b81996681..6eed4fee330808 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 8 +Port-Version: 9 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index a5d2d70e8875bc..aee9107add11b9 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -37,8 +37,8 @@ vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} vcpkg_install_make() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv) diff --git a/ports/liblemon/CONTROL b/ports/liblemon/CONTROL index 3463c5e301e4ef..0723131b9225bd 100644 --- a/ports/liblemon/CONTROL +++ b/ports/liblemon/CONTROL @@ -1,4 +1,5 @@ Source: liblemon -Version: 2019-06-13-1 +Version: 2019-06-13 +Port-Version: 2 Homepage: https://lemon.cs.elte.hu/trac/lemon Description: Library for Efficient Modeling and Optimization in Networks \ No newline at end of file diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index 14eebfe6c66cc5..6990e6ca62c4ce 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/lemon/cmake TARGET_PATH share/lemon) file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblemon/) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblemon) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/liblemon) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/liblinear/CONTROL b/ports/liblinear/CONTROL index 03a915a14344b8..0434973a3b6d61 100644 --- a/ports/liblinear/CONTROL +++ b/ports/liblinear/CONTROL @@ -1,5 +1,6 @@ Source: liblinear Version: 241 +Port-Version: 1 Homepage: https://github.com/cjlin1/liblinear Description: A Library for Large Linear Classification Supports: !uwp diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake index b48f03cd8aad86..feac5e974a857f 100644 --- a/ports/liblinear/portfile.cmake +++ b/ports/liblinear/portfile.cmake @@ -22,7 +22,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() if(NOT DISABLE_INSTALL_TOOLS) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/liblinear) endif() file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/liblo/CONTROL b/ports/liblo/CONTROL index 4efcd14c701002..8ffa66c8881e9c 100644 --- a/ports/liblo/CONTROL +++ b/ports/liblo/CONTROL @@ -1,4 +1,5 @@ Source: liblo Version: 0.31 +Port-Version: 1 Homepage: https://github.com/radarsat1/liblo Description: liblo is an implementation of the Open Sound Control protocol for POSIX systems \ No newline at end of file diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake index 9d02b65993c595..3cd92863041e8b 100644 --- a/ports/liblo/portfile.cmake +++ b/ports/liblo/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblo) file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo) file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblo) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/liblo) # Remove unnecessary files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index fe61ea40209e7a..e35f89e81bd93d 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -44,8 +44,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() vcpkg_install_make(${EXTRA_ARGS}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index c0c727f1d47b46..9f63ac322314d4 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmagic", "version-string": "5.40", + "port-version": 1, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "dependencies": [ diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake index 76cb968dc513ec..dcdac12659a026 100644 --- a/ports/libopenmpt/portfile.cmake +++ b/ports/libopenmpt/portfile.cmake @@ -22,6 +22,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libopenmpt) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/libopenmpt) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libopenmpt RENAME copyright) diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json index 3668ed848b6a70..94139ca7806d64 100644 --- a/ports/libopenmpt/vcpkg.json +++ b/ports/libopenmpt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopenmpt", "version-string": "2017-01-28-cf2390140", - "port-version": 2, + "port-version": 3, "description": "a library to render tracker music", "homepage": "https://github.com/OpenMPT/openmpt", "supports": "!uwp", diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 35cfd9e68aade5..30ff11c842abfe 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -255,7 +255,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(NOT HAS_TOOLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) else() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") @@ -304,7 +304,7 @@ else() if(NOT HAS_TOOLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) else() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug) endif() if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index a96a1f8b5eb523..446b58b2dc31fd 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 17, + "port-version": 18, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/ports/libqrencode/CONTROL b/ports/libqrencode/CONTROL index 51ac671a408b18..0641e02a835673 100644 --- a/ports/libqrencode/CONTROL +++ b/ports/libqrencode/CONTROL @@ -1,5 +1,6 @@ Source: libqrencode Version: 4.1.0 +Port-Version: 1 Build-Depends: libpng, libiconv Homepage: https://github.com/fukuchi/libqrencode Description: libqrencode - a fast and compact QR Code encoding library diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake index 0097ad6fc12eb4..e1498a4c0d6826 100644 --- a/ports/libqrencode/portfile.cmake +++ b/ports/libqrencode/portfile.cmake @@ -45,7 +45,7 @@ endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qrencode") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/qrencode/qrencode${EXECUTABLE_SUFFIX}") - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qrencode) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/qrencode) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7483e02c880e92..ef057f9e20fc2a 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -49,7 +49,7 @@ if("tools" IN_LIST FEATURES) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl${EXECUTABLE_SUFFIX}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ocspcheck${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/ocspcheck${EXECUTABLE_SUFFIX}") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/openssl") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 59c18243c2fb50..d11590e3b36506 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libressl", "version": "3.3.3", + "port-version": 1 "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", "features": { diff --git a/ports/libudis86/portfile.cmake b/ports/libudis86/portfile.cmake index 42d99d38a1e976..cb3f1ff237a831 100644 --- a/ports/libudis86/portfile.cmake +++ b/ports/libudis86/portfile.cmake @@ -26,6 +26,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libudis86) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/libudis86) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libudis86/vcpkg.json b/ports/libudis86/vcpkg.json index a687a41045a274..715369dc55b1e0 100644 --- a/ports/libudis86/vcpkg.json +++ b/ports/libudis86/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libudis86", "version-string": "2018-01-28-56ff6c87", - "port-version": 1, + "port-version": 2, "description": "Disassembler Library for x86 and x86-64", "homepage": "https://github.com/vmt/udis86" } diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index 2d9b2fd7d9cf24..4cb20daa45dbf4 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -1,6 +1,6 @@ Source: libwebp Version: 1.1.0 -Port-Version: 3 +Port-Version: 4 Homepage: https://github.com/webmproject/libwebp Description: WebP codec: library to encode and decode images in WebP format Default-Features: simd, nearlossless diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 97673b7e4ae4b6..a61e67dd69ce5b 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -81,7 +81,7 @@ foreach(tool ${BIN_NAMES}) file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") endif() endforeach() -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/webp") +vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/webp") #No tools file(GLOB_RECURSE RESULT "${CURRENT_PACKAGES_DIR}/tools/") diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index c242f99e489629..51d1713b0219df 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -288,7 +288,7 @@ if("pstl" IN_LIST FEATURES) file(INSTALL ${SOURCE_PATH}/pstl/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ParallelSTL RENAME copyright) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 06ef3712bba345..2c5061af650f8c 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "llvm", "version-string": "12.0.0", + "port-version": 1, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "supports": "!uwp", diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 11eeac875a23bd..bd1ea9db20b600 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -49,7 +49,7 @@ if("cpp" IN_LIST FEATURES) # lua[cpp] will create lua-c++, which uses C++ name m endif() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/lua) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index 36dd26376c6a4c..b93c2cc03ddb24 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lua", "version-string": "5.4.3", - "port-version": 1, + "port-version": 2, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", "features": { diff --git a/ports/luajit/CONTROL b/ports/luajit/CONTROL index f37d4dcbeb63b3..c128464a756c47 100644 --- a/ports/luajit/CONTROL +++ b/ports/luajit/CONTROL @@ -1,5 +1,6 @@ Source: luajit -Version: 2.0.5-3 +Version: 2.0.5 +Port-Version: 4 Homepage: https://github.com/LuaJIT/LuaJIT Description: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. Supports: !uwp \ No newline at end of file diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 262f7ec0908686..5567a01411627b 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -57,7 +57,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools) endif() vcpkg_copy_pdbs() endif() diff --git a/ports/mathgl/CONTROL b/ports/mathgl/CONTROL index 7dc82d3f97d770..1f63c5f884d67d 100644 --- a/ports/mathgl/CONTROL +++ b/ports/mathgl/CONTROL @@ -1,5 +1,6 @@ Source: mathgl -Version: 2.4.3-6 +Version: 2.4.3 +Port-Version: 7 Description: MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions Default-Features: opengl, jpeg, png, zlib diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index af6a6914084754..4a5eaa37ee5c0f 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -69,7 +69,7 @@ if (EXISTS ${CURRENT_PACKAGES_DIR}/bin/udav${EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/udav${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/mathgl/udav${EXECUTABLE_SUFFIX}) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mathgl) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/mathgl) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index 20cc0184e76cc8..6975695f11182e 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/minizip) if ("bzip2" IN_LIST FEATURES) file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h") diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index 9e8c24b8135fb1..c8bc8dbb6d4518 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "minizip", "version-semver": "1.2.11", - "port-version": 9, + "port-version": 10, "description": "Zip compression library", "homepage": "https://github.com/madler/zlib", "supports": "!uwp", diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL index 833aad90b587c7..ab4d30f31ed0b8 100644 --- a/ports/monkeys-audio/CONTROL +++ b/ports/monkeys-audio/CONTROL @@ -1,5 +1,6 @@ Source: monkeys-audio Version: 5.70 +Port-Version: 1 Homepage: https://monkeysaudio.com Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods. Audio files compressed with it end with .ape extension. diff --git a/ports/monkeys-audio/portfile.cmake b/ports/monkeys-audio/portfile.cmake index 40c2bccdecb300..adaa2f5d459ba4 100644 --- a/ports/monkeys-audio/portfile.cmake +++ b/ports/monkeys-audio/portfile.cmake @@ -57,7 +57,7 @@ if ("tools" IN_LIST FEATURES) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/Console.lib ${CURRENT_PACKAGES_DIR}/debug/lib/Console.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/Console.exe ${CURRENT_PACKAGES_DIR}/tools/monkeys-audio/mac.exe) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/moos-ui/CONTROL b/ports/moos-ui/CONTROL index 8894e8b091232d..bd4a661fcdc40a 100644 --- a/ports/moos-ui/CONTROL +++ b/ports/moos-ui/CONTROL @@ -1,5 +1,6 @@ Source: moos-ui -Version: 10.0.1-2 +Version: 10.0.1 +Port-Version: 3 Description: set of user interface tools to use and leverage the MOOS project. Homepage: https://sites.google.com/site/moossoftware/ Build-Depends: moos-core diff --git a/ports/moos-ui/portfile.cmake b/ports/moos-ui/portfile.cmake index e3f0dd4ee5793e..c9b0aa3cfba0ec 100644 --- a/ports/moos-ui/portfile.cmake +++ b/ports/moos-ui/portfile.cmake @@ -24,7 +24,7 @@ else() file(RENAME ${CURRENT_PACKAGES_DIR}/bin/uPoke ${CURRENT_PACKAGES_DIR}/tools/MOOS/uPoke) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/iRemoteLite ${CURRENT_PACKAGES_DIR}/tools/MOOS/iRemoteLite) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/MOOS) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/MOOS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/opencc/CONTROL b/ports/opencc/CONTROL index ab49052f045bb0..753f66a96e86ab 100644 --- a/ports/opencc/CONTROL +++ b/ports/opencc/CONTROL @@ -1,6 +1,6 @@ Source: opencc Version: 2020-04-26 -Port-Version: 7 +Port-Version: 8 Description: A project for conversion between Traditional and Simplified Chinese Homepage: https://github.com/BYVoid/OpenCC Supports: !(arm|arm64|uwp) diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index c67b2d33fc0e9e..d0cda8f4112210 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -33,7 +33,7 @@ if(tools IN_LIST FEATURES) ) endforeach() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index aac8fea5528019..e36d48f6a1cb5a 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -46,7 +46,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFF file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/openexr) vcpkg_copy_pdbs() diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index b293e7047da35c..1af032cf1b8ce7 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openexr", "version-string": "2.5.0", - "port-version": 3, + "port-version": 4, "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "supports": "!uwp", diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 547f7ba5daf086..6dc21f4930b45f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 6, + "port-version": 7, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 3065abddc6f04f..2905a60514db63 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -151,7 +151,7 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl/") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl.exe" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.exe") file(RENAME "${CURRENT_PACKAGES_DIR}/openssl.cnf" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl.cnf") -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl") +vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/openssl") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) # They should be empty, only the exes deleted above were in these directories diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL index d40b55adc6282a..d6636b1019ee0d 100644 --- a/ports/paraview/CONTROL +++ b/ports/paraview/CONTROL @@ -1,6 +1,6 @@ Source: paraview Version: 5.8.0 -Port-Version: 3 +Port-Version: 4 Homepage: https://www.paraview.org/ Description: VTK-based Data Analysis and Visualization Application Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index ab64ef34af2c8f..d3ca2c860b82b9 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -140,7 +140,7 @@ foreach(tool ${TOOLS}) file(REMOVE ${filename}) endif() endforeach() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # # Handle copyright file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/paraview RENAME Copyright.txt) # Which one is the correct one? diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 008b8934e562c9..19397709e59853 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -71,7 +71,7 @@ if("tools" IN_LIST FEATURES) file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pcl) file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pcl) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/pcl) endif() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index 4f0fa3a87576d9..53743da5cff29d 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcl", "version": "1.11.1", - "port-version": 4, + "port-version": 5, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "supports": "!(arm64 & windows)", diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL index 99643803d3173b..e8c4a36d71beb4 100644 --- a/ports/pdal/CONTROL +++ b/ports/pdal/CONTROL @@ -1,5 +1,5 @@ Source: pdal Version: 1.7.1 -Port-Version: 11 +Port-Version: 12 Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data. Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip, boost-system, boost-filesystem diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 18d27a4c4b1cd2..c17147b74eac00 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -52,7 +52,7 @@ vcpkg_copy_pdbs() file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(COPY ${_pdal_apps} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pdal) file(REMOVE ${_pdal_apps}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) # Post-install clean-up file(REMOVE_RECURSE diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL index 2c84efbfda06ec..573b9b5a92d0a0 100644 --- a/ports/pmdk/CONTROL +++ b/ports/pmdk/CONTROL @@ -1,5 +1,6 @@ Source: pmdk Version: 1.9 +Port-Version: 1 Homepage: https://github.com/pmem/pmdk Description: Persistent Memory Development Kit Supports: !(arm|x86) \ No newline at end of file diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake index 6f436e969ec2e0..a32f7df1163ce5 100644 --- a/ports/pmdk/portfile.cmake +++ b/ports/pmdk/portfile.cmake @@ -51,7 +51,7 @@ file(INSTALL ${LIB_RELEASE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) # Install tools (release only) file(INSTALL ${RELEASE_ARTIFACTS_PATH}/libs/pmempool.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pmdk) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/pmdk) vcpkg_copy_pdbs() diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 4ee2b825da7d4b..ccd30dc2156721 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -125,7 +125,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB_RECURSE PYTHON_EXTENSIONS "${CURRENT_BUILDTREES_DIR}/*.pyd") list(FILTER PYTHON_EXTENSIONS EXCLUDE REGEX [[.*_d\.pyd]]) file(COPY ${PYTHON_EXTENSIONS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs") file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/DLLs/python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.dll") endif() diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 2f562e6c6d004e..f06ad9dc4b6b18 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-string": "3.9.5", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index 52f9c6c1ba3f7f..0d555abf3a604e 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -85,7 +85,7 @@ function(qt_build_submodule SOURCE_PATH) configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_release.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/qt.conf) # This makes the tools at least useable for release set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/*.dll") string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") @@ -108,7 +108,7 @@ function(qt_build_submodule SOURCE_PATH) configure_file(${CURRENT_INSTALLED_DIR_BACKUP}/tools/qt5/qt_debug.conf ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/qt.conf) # This makes the tools at least useable for release set(CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR_BACKUP}") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB_RECURSE DLL_DEPS_AVAIL "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/*.dll") string(REPLACE "${CURRENT_INSTALLED_DIR}/tools/qt5/debug/bin/" "" DLL_DEPS_AVAIL "${DLL_DEPS_AVAIL}") diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 25eeb2e5c819e5..50931369d99f4a 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -443,13 +443,13 @@ else() if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin) file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/bin) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/qt5/bin) endif() # This should be removed if possible! (Currently debug build of qt5-translations requires it.) if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5/bin) file(COPY ${CURRENT_PACKAGES_DIR}/tools/qt5/bin DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5/debug) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/qt5/debug/bin) endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5/bin/qt.conf) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 0d0c32119661e8..6dd639243e4c32 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 9, + "port-version": 10, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 3b966e0353e45d..e153daa0c819ec 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -72,7 +72,7 @@ if(BUILD_TOOLS) file(REMOVE ${EXEFILES_RELEASE}) endif() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/realsense2) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/realsense2) file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) if(NOT BINS) diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index d14554b308de22..a138c6a43249a2 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "realsense2", "version": "2.42.0", - "port-version": 1, + "port-version": 2, "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "dependencies": [ diff --git a/ports/rtlsdr/CONTROL b/ports/rtlsdr/CONTROL index cbd10d653bf570..4042a17b3c7606 100644 --- a/ports/rtlsdr/CONTROL +++ b/ports/rtlsdr/CONTROL @@ -1,5 +1,6 @@ Source: rtlsdr -Version: 2020-04-16-1 +Version: 2020-04-16 +Port-Version: 2 Homepage: https://osmocom.org/projects/rtl-sdr Description: rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver Build-Depends: libusb, pthreads (windows) diff --git a/ports/rtlsdr/portfile.cmake b/ports/rtlsdr/portfile.cmake index fdf48429032381..b60df706ee57f5 100644 --- a/ports/rtlsdr/portfile.cmake +++ b/ports/rtlsdr/portfile.cmake @@ -45,6 +45,6 @@ else() INSTALL ${RELEASE_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE ${DEBUG_TOOLS} ${RELEASE_TOOLS}) endif() diff --git a/ports/sassc/CONTROL b/ports/sassc/CONTROL index b2fc8e63f7baa4..917e1b7e80830e 100644 --- a/ports/sassc/CONTROL +++ b/ports/sassc/CONTROL @@ -1,6 +1,6 @@ Source: sassc Version: 3.6.1 -Port-Version: 0 +Port-Version: 1 Description: SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems. Homepage: https://github.com/sass/sassc Build-Depends: libsass, getopt diff --git a/ports/sassc/portfile.cmake b/ports/sassc/portfile.cmake index 764873d043e629..1f02e5823969eb 100644 --- a/ports/sassc/portfile.cmake +++ b/ports/sassc/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_install_make(MAKEFILE GNUmakefile) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/sf2cute/CONTROL b/ports/sf2cute/CONTROL index bdba56cc709ed6..04afb1badcdf13 100644 --- a/ports/sf2cute/CONTROL +++ b/ports/sf2cute/CONTROL @@ -1,5 +1,6 @@ Source: sf2cute -Version: 0.2.0-1 +Version: 0.2.0 +Port-Version: 2 Description: C++14 Library for SoundFont 2 Feature: example diff --git a/ports/sf2cute/portfile.cmake b/ports/sf2cute/portfile.cmake index d82c0f94f9a527..734a922a4cb1aa 100644 --- a/ports/sf2cute/portfile.cmake +++ b/ports/sf2cute/portfile.cmake @@ -32,5 +32,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sf2cute RENAME copyright) if(BUILD_EXAMPLE) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/sf2cute) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/sf2cute) endif() diff --git a/ports/shapelib/CONTROL b/ports/shapelib/CONTROL index e656682756f7b9..01227fe1aae76c 100644 --- a/ports/shapelib/CONTROL +++ b/ports/shapelib/CONTROL @@ -1,4 +1,5 @@ Source: shapelib Version: 1.5.0 +Port-Version: 1 Homepage: https://download.osgeo.org/shapelib Description: Shapefile C Library is simple C API for reading and writing ESRI Shapefiles diff --git a/ports/shapelib/portfile.cmake b/ports/shapelib/portfile.cmake index 3aceff84d7a016..46e259680e4ae9 100644 --- a/ports/shapelib/portfile.cmake +++ b/ports/shapelib/portfile.cmake @@ -44,6 +44,6 @@ endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/shapelib) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/shapelib) vcpkg_copy_pdbs() diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index 02c27357c85609..a82d30924f9fe9 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -83,4 +83,4 @@ configure_file( file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index ed3ff2876f44b5..1980e6742b1054 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlcipher", "version": "4.4.3", + "port-version": 1 "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "supports": "windows & !uwp & !static", diff --git a/ports/stxxl/CONTROL b/ports/stxxl/CONTROL index 42609d34f35f57..0796322041735f 100644 --- a/ports/stxxl/CONTROL +++ b/ports/stxxl/CONTROL @@ -1,3 +1,4 @@ Source: stxxl -Version: 2018-11-15-2 +Version: 2018-11-15 +Port-Version: 3 Description: Standard Template Library for Extra Large Data Sets diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index a45fce791fb945..71cea0e97cb371 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -57,7 +57,7 @@ endif() file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/stxxl_tool${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake index e30d93ac4f745e..ec5a0f2e39bc16 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -49,7 +49,7 @@ if("tool" IN_LIST FEATURES) file(COPY "${TGUI_SHARE_PATH}/gui-builder/resources" DESTINATION "${TGUI_TOOLS_PATH}") file(COPY "${TGUI_SHARE_PATH}/gui-builder/themes" DESTINATION "${TGUI_TOOLS_PATH}") file(REMOVE_RECURSE "${TGUI_SHARE_PATH}/gui-builder") - vcpkg_copy_tool_dependencies("${TGUI_TOOLS_PATH}") + vcpkg_copy_tool_dependencies(TOOL_DIR "${TGUI_TOOLS_PATH}") endif() endif() diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index 387a20c909c0ac..b925d0589bc0a7 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 2, + "port-version": 3, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "default-features": [ diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index 2916e3e33fe147..d55b401f52c8f0 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,5 +1,6 @@ Source: thrift Version: 0.13.0 +Port-Version: 1 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit Homepage: https://github.com/apache/thrift Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index f39ba11b90c674..f2cbf8ce5fa6be 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -55,7 +55,7 @@ file(GLOB COMPILER "${CURRENT_PACKAGES_DIR}/bin/thrift" "${CURRENT_PACKAGES_DIR} if(COMPILER) file(COPY ${COMPILER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/thrift) file(REMOVE ${COMPILER}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/thrift) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/thrift) endif() file(GLOB COMPILERD "${CURRENT_PACKAGES_DIR}/debug/bin/thrift" "${CURRENT_PACKAGES_DIR}/debug/bin/thrift.exe") diff --git a/ports/tidy-html5/CONTROL b/ports/tidy-html5/CONTROL index b7ad75aea56f46..bccbe7d472014f 100644 --- a/ports/tidy-html5/CONTROL +++ b/ports/tidy-html5/CONTROL @@ -1,4 +1,5 @@ Source: tidy-html5 -Version: 5.7.28-2 +Version: 5.7.28 +Port-Version: 3 Homepage: https://github.com/htacg/tidy-html5 Description: Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools. diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index ddf60c6b29131b..7eec6fc568f89f 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -34,7 +34,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/uchardet/CONTROL b/ports/uchardet/CONTROL index 587f25d6826809..ace8e56fba3f4d 100644 --- a/ports/uchardet/CONTROL +++ b/ports/uchardet/CONTROL @@ -1,5 +1,6 @@ Source: uchardet Version: 2020-04-26 +Port-Version: 1 Description: An encoding detector library ported from Mozilla Homepage: https://cgit.freedesktop.org/uchardet/uchardet/ diff --git a/ports/uchardet/portfile.cmake b/ports/uchardet/portfile.cmake index 281dec77dad354..4a999e41335e20 100644 --- a/ports/uchardet/portfile.cmake +++ b/ports/uchardet/portfile.cmake @@ -38,7 +38,7 @@ if(tool IN_LIST FEATURES) DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index cd76b37bb0e0b3..6a0254104fce0c 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,6 @@ Source: vtk Version: 9.0.1 -Port-Version: 6 +Port-Version: 7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 596731a33a578b..a5a65f75d6e2e1 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -296,7 +296,7 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk") +vcpkg_copy_tool_dependencies(TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/vtk") ## Files Modules needed by ParaView if("paraview" IN_LIST FEATURES) diff --git a/ports/woff2/CONTROL b/ports/woff2/CONTROL index 69a5c0ce25d94c..70ccb918316a8d 100644 --- a/ports/woff2/CONTROL +++ b/ports/woff2/CONTROL @@ -1,5 +1,6 @@ Source: woff2 Version: 1.0.2 -Build-Depends: brotli -Port-Version: 1 +Port-Version: 2 +Homepage: https://github.com/google/woff2 Description: font compression reference code +Build-Depends: brotli diff --git a/ports/woff2/portfile.cmake b/ports/woff2/portfile.cmake index 7e71859bf04bd7..bc9a86cf5d68b0 100644 --- a/ports/woff2/portfile.cmake +++ b/ports/woff2/portfile.cmake @@ -29,6 +29,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/woff2) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/woff2) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/woff2 RENAME copyright) diff --git a/ports/zopfli/CONTROL b/ports/zopfli/CONTROL index 97261af029a17d..0d95f2cd6f8fd2 100644 --- a/ports/zopfli/CONTROL +++ b/ports/zopfli/CONTROL @@ -1,4 +1,5 @@ Source: zopfli Version: 1.0.3 +Port-Version: 1 Homepage: https://github.com/google/zopfli Description: Zopfli Compression Algorithm compression library programmed in C diff --git a/ports/zopfli/portfile.cmake b/ports/zopfli/portfile.cmake index 7ce1dfeffb871f..2e9dae46055508 100644 --- a/ports/zopfli/portfile.cmake +++ b/ports/zopfli/portfile.cmake @@ -28,7 +28,7 @@ file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL index 73507fea17f7ef..87983248f7e733 100644 --- a/ports/zxing-cpp/CONTROL +++ b/ports/zxing-cpp/CONTROL @@ -1,5 +1,6 @@ Source: zxing-cpp Version: 2020-12-2 +Port-Version: 1 Homepage: https://github.com/glassechidna/zxing-cpp Description: Barcode detection and decoding library. Build-Depends: bigint diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake index ce2a45669f7601..d38bf49008d6f8 100644 --- a/ports/zxing-cpp/portfile.cmake +++ b/ports/zxing-cpp/portfile.cmake @@ -32,7 +32,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies(TOOL_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/zxing/cmake TARGET_PATH share/zxing) From ef230d17440c0b1276fa3ae79733ebbd9ba2951f Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 19:37:12 -0700 Subject: [PATCH 07/25] Apply suggestion --- .../vcpkg_copy_tool_dependencies.md | 9 +++++--- docs/maintainers/vcpkg_copy_tools.md | 9 +++++--- ports/yasm/portfile.cmake | 2 +- .../cmake/vcpkg_copy_tool_dependencies.cmake | 21 +++++++++++-------- scripts/cmake/vcpkg_copy_tools.cmake | 13 +++++++----- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index ed637c9eecf90d..bd0963d8d73203 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -8,14 +8,17 @@ Copy all DLL dependencies of built tools into the tool folder. ```cmake vcpkg_copy_tool_dependencies( TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}> - [DYNAMIC_DEPENS ...] + [DEPENDENCIES ...] ) ``` ## TOOL_DIR The path to the directory containing the tools. -### DYNAMIC_DEPENS -A list of tool's dynamic dependency library names. +### DEPENDENCIES +A list of dynamic libraries a tool is likely to load at runtime, such as plugins, +or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen. +These libraries will be copied into the same directory as the tool +even if they are not statically determined as dependencies from inspection of their import tables. ## Notes This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. diff --git a/docs/maintainers/vcpkg_copy_tools.md b/docs/maintainers/vcpkg_copy_tools.md index bddae6548e7409..68409242f1075b 100644 --- a/docs/maintainers/vcpkg_copy_tools.md +++ b/docs/maintainers/vcpkg_copy_tools.md @@ -10,7 +10,7 @@ vcpkg_copy_tools( TOOL_NAMES ... [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] - [DYNAMIC_DEPENS ...] + [DEPENDENCIES ...] [AUTO_CLEAN] ) ``` @@ -24,8 +24,11 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P ### DESTINATION Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. -### DYNAMIC_DEPENS -A list of tool's dynamic dependency library names. +### DEPENDENCIES +A list of dynamic libraries a tool is likely to load at runtime, such as plugins, +or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen. +These libraries will be copied into the same directory as the tool +even if they are not statically determined as dependencies from inspection of their import tables. ### AUTO_CLEAN Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 118c93676efa3b..1f63ea6810c999 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -27,7 +27,7 @@ vcpkg_copy_pdbs() if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(EXTRA_OPTION yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) endif() -vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm DYNAMIC_DEPENS ${EXTRA_OPTION} AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm DEPENDENCIES ${EXTRA_OPTION} AUTO_CLEAN) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index b3e283525e76b3..c781b3efd1ee27 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -7,14 +7,17 @@ Copy all DLL dependencies of built tools into the tool folder. ```cmake vcpkg_copy_tool_dependencies( TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}> - [DYNAMIC_DEPENS ...] + [DEPENDENCIES ...] ) ``` ## TOOL_DIR The path to the directory containing the tools. -### DYNAMIC_DEPENS -A list of tool's dynamic dependency library names. +## DEPENDENCIES +A list of dynamic libraries a tool is likely to load at runtime, such as plugins, +or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen. +These libraries will be copied into the same directory as the tool +even if they are not statically determined as dependencies from inspection of their import tables. ## Notes This command should always be called by portfiles after they have finished rearranging the binary output, if they have any tools. @@ -26,7 +29,7 @@ This command should always be called by portfiles after they have finished rearr #]===] function(vcpkg_copy_tool_dependencies TOOL_DIR) - cmake_parse_arguments(PARSE_ARGV 0 _vctd "" "TOOL_DIR" "DYNAMIC_DEPENS") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "TOOL_DIR" "DEPENDENCIES") if (VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_EXE pwsh) if (NOT PWSH_EXE) @@ -36,7 +39,7 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR) message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.") endif() macro(search_for_dependencies PATH_TO_SEARCH) - file(GLOB TOOLS "${_vctd_TOOL_DIR}/*.exe" "${_vctd_TOOL_DIR}/*.dll" "${_vctd_TOOL_DIR}/*.pyd") + file(GLOB TOOLS "${arg_TOOL_DIR}/*.exe" "${arg_TOOL_DIR}/*.dll" "${arg_TOOL_DIR}/*.pyd") foreach(TOOL IN LISTS TOOLS) vcpkg_execute_required_process( COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo @@ -51,11 +54,11 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR) search_for_dependencies("${CURRENT_PACKAGES_DIR}/bin") search_for_dependencies("${CURRENT_INSTALLED_DIR}/bin") - if (_vctd_DYNAMIC_DEPENS) - foreach (SEARCH_ITEM ${_vctd_DYNAMIC_DEPENS}) + if (arg_DEPENDENCIES) + foreach (SEARCH_ITEM IN_LIST ${arg_DEPENDENCIES}) if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM}") - debug_message("Copying file ${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM} to ${_vctd_TOOL_DIR}") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM}" DESTINATION "${_vctd_TOOL_DIR}") + debug_message("Copying file ${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM} to ${arg_TOOL_DIR}") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/${SEARCH_ITEM}" DESTINATION "${arg_TOOL_DIR}") else() message(WARNING "Dynamic dependency ${SEARCH_ITEM} not found in ${CURRENT_PACKAGES_DIR}/bin.") endif() diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index ddc6b7855e02d5..2cfabf4f515867 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -9,7 +9,7 @@ vcpkg_copy_tools( TOOL_NAMES ... [SEARCH_DIR <${CURRENT_PACKAGES_DIR}/bin>] [DESTINATION <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] - [DYNAMIC_DEPENS ...] + [DEPENDENCIES ...] [AUTO_CLEAN] ) ``` @@ -23,8 +23,11 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P ### DESTINATION Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. -### DYNAMIC_DEPENS -A list of tool's dynamic dependency library names. +### DEPENDENCIES +A list of dynamic libraries a tool is likely to load at runtime, such as plugins, +or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen. +These libraries will be copied into the same directory as the tool +even if they are not statically determined as dependencies from inspection of their import tables. ### AUTO_CLEAN Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. @@ -38,7 +41,7 @@ Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_ function(vcpkg_copy_tools) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vct "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES;DYNAMIC_DEPENS") + cmake_parse_arguments(PARSE_ARGV 0 _vct "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES;DEPENDENCIES") if(NOT DEFINED _vct_TOOL_NAMES) message(FATAL_ERROR "TOOL_NAMES must be specified.") @@ -67,7 +70,7 @@ function(vcpkg_copy_tools) endif() endforeach() - vcpkg_copy_tool_dependencies(TOOL_DIR "${_vct_DESTINATION}" DYNAMIC_DEPENS "${_vct_DYNAMIC_DEPENS}") + vcpkg_copy_tool_dependencies(TOOL_DIR "${_vct_DESTINATION}" DEPENDENCIES "${_vct_DEPENDENCIES}") if(_vct_AUTO_CLEAN) vcpkg_clean_executables_in_bin(FILE_NAMES ${_vct_TOOL_NAMES}) From f6f3b99db5cc2699ae34cc14412528e75cb05ff1 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 19:39:49 -0700 Subject: [PATCH 08/25] fix typo --- ports/libressl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index d11590e3b36506..bb66aa072688a3 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libressl", "version": "3.3.3", - "port-version": 1 + "port-version": 1, "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", "features": { From 2a122d9efd75d0fcaef2117f96b60b170d6cca34 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 19:42:58 -0700 Subject: [PATCH 09/25] typo --- ports/sqlcipher/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index 1980e6742b1054..8f80671d2c1811 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlcipher", "version": "4.4.3", - "port-version": 1 + "port-version": 1, "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "supports": "windows & !uwp & !static", From 0c70aa2749f9642049eaccd386279e878685ee19 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 19:45:08 -0700 Subject: [PATCH 10/25] Update doc --- docs/maintainers/vcpkg_copy_tool_dependencies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index bd0963d8d73203..5196075b691726 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -14,7 +14,7 @@ vcpkg_copy_tool_dependencies( ## TOOL_DIR The path to the directory containing the tools. -### DEPENDENCIES +## DEPENDENCIES A list of dynamic libraries a tool is likely to load at runtime, such as plugins, or other Run-Time Dynamic Linking mechanisms like LoadLibrary or dlopen. These libraries will be copied into the same directory as the tool From 7e5d4fe0c459527d4b3621cbc409470063fd44a1 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 23:32:26 -0700 Subject: [PATCH 11/25] Fix path --- ports/yasm-tool-helper/yasm-tool-helper.cmake.in | 2 +- ports/yasm/portfile.cmake | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in index 48bd805f3bf270..8e69ef519e9b25 100644 --- a/ports/yasm-tool-helper/yasm-tool-helper.cmake.in +++ b/ports/yasm-tool-helper/yasm-tool-helper.cmake.in @@ -1 +1 @@ -include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm-tool/vcpkg-port-config.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/share/yasm/vcpkg-port-config.cmake") diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 1f63ea6810c999..5444d50992702c 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -31,5 +31,7 @@ vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm DEPENDENCIES ${EXTRA_OPTION} AUTO_ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +configure_file("${CURRENT_PORT_DIR}/vcpkg-port-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file From 10bda6400edcfb4b5740a6d3d9e64f72cb8aee18 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 23:39:48 -0700 Subject: [PATCH 12/25] set TOOL_DIR default value --- docs/maintainers/vcpkg_copy_tool_dependencies.md | 2 +- scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index 5196075b691726..5433d346165711 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -12,7 +12,7 @@ vcpkg_copy_tool_dependencies( ) ``` ## TOOL_DIR -The path to the directory containing the tools. +The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ## DEPENDENCIES A list of dynamic libraries a tool is likely to load at runtime, such as plugins, diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index c781b3efd1ee27..e46fd263adfaa9 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -6,12 +6,12 @@ Copy all DLL dependencies of built tools into the tool folder. ## Usage ```cmake vcpkg_copy_tool_dependencies( - TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}> + [TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] [DEPENDENCIES ...] ) ``` ## TOOL_DIR -The path to the directory containing the tools. +The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ## DEPENDENCIES A list of dynamic libraries a tool is likely to load at runtime, such as plugins, @@ -28,8 +28,13 @@ This command should always be called by portfiles after they have finished rearr * [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake) #]===] -function(vcpkg_copy_tool_dependencies TOOL_DIR) +function(vcpkg_copy_tool_dependencies) cmake_parse_arguments(PARSE_ARGV 0 arg "" "TOOL_DIR" "DEPENDENCIES") + + if (NOT DEFINED arg_TOOL_DIR) + set(arg_TOOL_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() + if (VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_EXE pwsh) if (NOT PWSH_EXE) From d8b2e83148009401204b7c4975441131e47e6485 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Thu, 8 Jul 2021 23:42:48 -0700 Subject: [PATCH 13/25] update doc --- docs/maintainers/vcpkg_copy_tool_dependencies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index 5433d346165711..bbe1aca204a677 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -7,7 +7,7 @@ Copy all DLL dependencies of built tools into the tool folder. ## Usage ```cmake vcpkg_copy_tool_dependencies( - TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}> + [TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] [DEPENDENCIES ...] ) ``` From edcef243ea579c251d46bf89e5b629f8841ea529 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sun, 11 Jul 2021 23:50:51 -0700 Subject: [PATCH 14/25] Correct the tool path --- ports/yasm/vcpkg-port-config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/yasm/vcpkg-port-config.cmake.in b/ports/yasm/vcpkg-port-config.cmake.in index 59a9efc79865f4..af374280554fa9 100644 --- a/ports/yasm/vcpkg-port-config.cmake.in +++ b/ports/yasm/vcpkg-port-config.cmake.in @@ -11,7 +11,7 @@ function(yasm_tool_helper) message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}") endif() - find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm-tool") + find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm") if(arg_APPEND_TO_PATH) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) From c0ed2caddc76f8e6c5031b68efb8654e50d9a3df Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:22:49 -0800 Subject: [PATCH 15/25] version --- versions/baseline.json | 2 +- versions/y-/yasm-tool.json | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 versions/y-/yasm-tool.json diff --git a/versions/baseline.json b/versions/baseline.json index 2bc9ae4cbb405c..8d432d0950010b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7401,7 +7401,7 @@ "port-version": 2 }, "yasm-tool": { - "baseline": "1.3.0", + "baseline": "2021-12-14", "port-version": 0 }, "yasm-tool-helper": { diff --git a/versions/y-/yasm-tool.json b/versions/y-/yasm-tool.json new file mode 100644 index 00000000000000..429d5e99fbca33 --- /dev/null +++ b/versions/y-/yasm-tool.json @@ -0,0 +1,19 @@ +{ + "versions": [ + { + "git-tree": "b62af69e5c033b68f20c1b79187cc101f0fd2f5e", + "version-date": "2021-12-14", + "port-version": 0 + }, + { + "git-tree": "cb913a26c18cde98be038655f65d2363ecee2cc1", + "version": "1.3.0", + "port-version": 0 + }, + { + "git-tree": "40cca1c50553ac0d87c91af9c0125d8f3e6e8a09", + "version-string": "2020-10-12", + "port-version": 0 + } + ] +} From 5543487fa0be9c00144154109eec71d1a5e81c6c Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:23:27 -0800 Subject: [PATCH 16/25] version --- versions/baseline.json | 2 +- versions/y-/yasm.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 8d432d0950010b..fae086e1369bfd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7398,7 +7398,7 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "yasm-tool": { "baseline": "2021-12-14", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index ba2175f48bdb26..66525e11fe179f 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fab557a25a9420bd9fe441b95b88c3735379799", + "version-string": "1.3.0", + "port-version": 3 + }, { "git-tree": "eaab6c3ae3bfc1ffcfaee3b1695d7ee21dacc7b1", "version-string": "1.3.0", From dcbdaa36d3bac9ca66ddebe604859b5dcb83aa4e Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:25:19 -0800 Subject: [PATCH 17/25] change to version --- ports/yasm/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json index 53324bde4a604c..f78ff774575d80 100644 --- a/ports/yasm/vcpkg.json +++ b/ports/yasm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yasm", - "version-string": "1.3.0", + "version": "1.3.0", "port-version": 3, "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", From 8f9cb33eff56233619951a8e1bdccf4196b150fd Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:25:41 -0800 Subject: [PATCH 18/25] version --- versions/baseline.json | 2 +- versions/y-/yasm-tool-helper.json | 5 +++++ versions/y-/yasm.json | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index fae086e1369bfd..94177ba9c12314 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7406,7 +7406,7 @@ }, "yasm-tool-helper": { "baseline": "2020-03-11", - "port-version": 0 + "port-version": 1 }, "yato": { "baseline": "1.0", diff --git a/versions/y-/yasm-tool-helper.json b/versions/y-/yasm-tool-helper.json index 606a5eee5603e9..056e0b7c1e2181 100644 --- a/versions/y-/yasm-tool-helper.json +++ b/versions/y-/yasm-tool-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56fd355bef577119b2c389e9416c189ee37db669", + "version-string": "2020-03-11", + "port-version": 1 + }, { "git-tree": "7d0e3b2224338888cd1e2f7a00c182961a7ea760", "version-string": "2020-03-11", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 66525e11fe179f..aa08b67773fc8c 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "1fab557a25a9420bd9fe441b95b88c3735379799", - "version-string": "1.3.0", + "git-tree": "ec2bb096cdd5d37790a67e48e3fcd31674506632", + "version": "1.3.0", "port-version": 3 }, { From 670e928525e91cbcd0594a7cb81825680178e621 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:27:20 -0800 Subject: [PATCH 19/25] restore unnecessary changes --- ports/chakracore/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 224c4d897dde94..62277ecebe3f95 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -147,4 +147,4 @@ file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/chakracore" RENAME copyright -) +) From 14d35f536ccc8451351a6c690985716da6f31f86 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:38:25 -0800 Subject: [PATCH 20/25] Correct code --- ports/yasm-tool-helper/vcpkg.json | 5 ++++- ports/yasm/portfile.cmake | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/yasm-tool-helper/vcpkg.json b/ports/yasm-tool-helper/vcpkg.json index 70cdc6c69cbd74..de2345deed4679 100644 --- a/ports/yasm-tool-helper/vcpkg.json +++ b/ports/yasm-tool-helper/vcpkg.json @@ -7,7 +7,10 @@ "dependencies": [ { "name": "yasm", - "host": true + "host": true, + "features": [ + "tools" + ] } ] } diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 68dfa9afc2ef0c..4c6b3e6dbfd65b 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -30,16 +30,16 @@ vcpkg_copy_pdbs() if (BUILD_TOOLS) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + set(EXTRA_OPTION yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(COPY "${CURRENT_PACKAGES_DIR}/bin/${EXTRA_OPTION}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() - vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm DEPENDENCIES ${EXTRA_OPTION} AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_copy_tools(vsyasm yasm ytasm DEPENDENCIES ${EXTRA_OPTION} AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From a6c385b590dc6c749986e79a339dbc1a5ffcb30a Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 01:39:19 -0800 Subject: [PATCH 21/25] version --- versions/y-/yasm-tool-helper.json | 2 +- versions/y-/yasm.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/y-/yasm-tool-helper.json b/versions/y-/yasm-tool-helper.json index 056e0b7c1e2181..dbf1dbab8f1d1d 100644 --- a/versions/y-/yasm-tool-helper.json +++ b/versions/y-/yasm-tool-helper.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "56fd355bef577119b2c389e9416c189ee37db669", + "git-tree": "f3d14b4df8f7728c33da60f816225b46821b608d", "version-string": "2020-03-11", "port-version": 1 }, diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index aa08b67773fc8c..d35d9fecc35371 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ec2bb096cdd5d37790a67e48e3fcd31674506632", + "git-tree": "4fc2842b2d30dc42331d3bfefe91fd571a4e06a4", "version": "1.3.0", "port-version": 3 }, From c5affe2fe8d3be68342c1a657769737fe4b5a653 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 18:39:04 -0800 Subject: [PATCH 22/25] [gmp] Change dependency yasm-tool to yasm --- ports/gmp/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index f907a9babdb175..76a59e9192a03d 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version-string": "6.2.1", - "port-version": 7, + "port-version": 8, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", @@ -12,7 +12,7 @@ "platform": "windows" }, { - "name": "yasm-tool", + "name": "yasm", "host": true, "platform": "windows" } From 00219668b8413d8b47b9b527d6221e2e493ee795 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 18:40:21 -0800 Subject: [PATCH 23/25] Update doc --- docs/maintainers/vcpkg_copy_tool_dependencies.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/maintainers/vcpkg_copy_tool_dependencies.md b/docs/maintainers/vcpkg_copy_tool_dependencies.md index bbe1aca204a677..2232335803c13e 100644 --- a/docs/maintainers/vcpkg_copy_tool_dependencies.md +++ b/docs/maintainers/vcpkg_copy_tool_dependencies.md @@ -7,11 +7,11 @@ Copy all DLL dependencies of built tools into the tool folder. ## Usage ```cmake vcpkg_copy_tool_dependencies( - [TOOL_DIR <${CURRENT_PACKAGES_DIR}/tools/${PORT}>] + <${CURRENT_PACKAGES_DIR}/tools/${PORT}> [DEPENDENCIES ...] ) ``` -## TOOL_DIR +## tool_dir The path to the directory containing the tools. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ## DEPENDENCIES From 94cfd2828419663f687e9787ccabb5190633bc95 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 18:53:03 -0800 Subject: [PATCH 24/25] Change to host path instead --- ports/yasm/vcpkg-port-config.cmake.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/yasm/vcpkg-port-config.cmake.in b/ports/yasm/vcpkg-port-config.cmake.in index af374280554fa9..11c2fde86a77be 100644 --- a/ports/yasm/vcpkg-port-config.cmake.in +++ b/ports/yasm/vcpkg-port-config.cmake.in @@ -1,4 +1,12 @@ -set(Z_YASM_TOOL_HELPER_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}") +# For the exported file, we should set 'Z_YASM_TOOL_HELPER_LIST_DIR' before calling 'find_package' +if (NOT DEFINED Z_YASM_TOOL_HELPER_LIST_DIR OR NOT Z_YASM_TOOL_HELPER_LIST_DIR) + # Get the host installed dir, use relative path here + set(Z_YASM_TOOL_HELPER_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}") + get_filename_component(Z_YASM_TOOL_HELPER_LIST_DIR "${Z_YASM_TOOL_HELPER_LIST_DIR}" PATH) + get_filename_component(Z_YASM_TOOL_HELPER_LIST_DIR "${Z_YASM_TOOL_HELPER_LIST_DIR}" PATH) + get_filename_component(Z_YASM_TOOL_HELPER_LIST_DIR "${Z_YASM_TOOL_HELPER_LIST_DIR}" PATH) + set(Z_YASM_TOOL_HELPER_LIST_DIR "${Z_YASM_TOOL_HELPER_LIST_DIR}/@HOST_TRIPLET@") +endif() function(yasm_tool_helper) cmake_parse_arguments(PARSE_ARGV 0 arg @@ -11,7 +19,7 @@ function(yasm_tool_helper) message(FATAL_ERROR "Unexpected arguments to yasm_tool_helper: ${arg_UNPARSED_ARGUMENTS}") endif() - find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/../../tools/yasm") + find_program(YASM yasm PATHS "${Z_YASM_TOOL_HELPER_LIST_DIR}/tools/yasm") if(arg_APPEND_TO_PATH) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) From b209da20e80306090bd82f9f13966084eda2fad8 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 14 Dec 2021 18:53:19 -0800 Subject: [PATCH 25/25] version --- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ versions/y-/yasm.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 94177ba9c12314..a4c2774a191425 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2514,7 +2514,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 7 + "port-version": 8 }, "google-cloud-cpp": { "baseline": "1.34.1", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 52dbc389f06f3d..f7edd4013559e1 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59549497251993927a45b78b09b9785f59ce7cf2", + "version-string": "6.2.1", + "port-version": 8 + }, { "git-tree": "5d207c0d8a6481f96f2277fd3245f2a80456a706", "version-string": "6.2.1", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index d35d9fecc35371..132165b359f18d 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4fc2842b2d30dc42331d3bfefe91fd571a4e06a4", + "git-tree": "41a8767b57b9525eec3cf3b53fa52616906e2dde", "version": "1.3.0", "port-version": 3 },