From 70da1e09974c393844c7245b690bf95ea8b7ebf3 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:38:52 +0200 Subject: [PATCH 01/41] cppcms --- ports/cppcms/portfile.cmake | 15 +++++++-------- ports/cppcms/vcpkg.json | 11 ++++++++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 54bc5703970e7d..efc993d569da1e 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -9,20 +9,19 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON2) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYTHON=${PYTHON2} # Switch to python3 on the next update -DUSE_WINDOWS6_API=ON ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(GLOB EXE_DEBUG_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(GLOB EXE_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") file(REMOVE ${EXE_DEBUG_FILES}) -file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(GLOB EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe") file(REMOVE ${EXE_FILES}) -file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 601d5755041cdb..7a66c04b08e8d6 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -1,14 +1,19 @@ { "name": "cppcms", - "version-string": "1.2.1", - "port-version": 4, + "version": "1.2.1", + "port-version": 5, "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", - "supports": "!(linux | osx)", + "license": "MIT", + "supports": "!(linux | osx | (windows & staticcrt))", "dependencies": [ "icu", "openssl", "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } From d028b728ace119b5ad371df22e33c3c82f60d065 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:39:28 +0200 Subject: [PATCH 02/41] cudnn --- ports/cudnn/portfile.cmake | 16 ++++------------ ports/cudnn/vcpkg.json | 6 +++--- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 594c74fed6e6cb..28da85e460f7b3 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -1,16 +1,8 @@ -if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "This port is only for Windows Desktop or Linux") -endif() - -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "This port is only for x64 architectures") -endif() - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(MINIMUM_CUDNN_VERSION "7.6.5") -include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) +include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION) # Try to find CUDNN if it exists; only download if it doesn't exist @@ -71,6 +63,6 @@ else() message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.") endif() -file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index ffb97ee1723f8d..ed75e28a20348a 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -1,11 +1,11 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 6, + "port-version": 7, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", - "license": null, - "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)", + "license": "NVIDIA", + "supports": "(windows & x64 & !uwp & !static) | (linux & x64) | (linux & arm64)", "dependencies": [ "cuda" ] From 4992e480aba2796be10f653edde8510a47f19bda Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:40:35 +0200 Subject: [PATCH 03/41] devicenameresolver --- ports/devicenameresolver/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index 0647d0831645d9..10a13bac07a5ec 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -1,9 +1,9 @@ { "name": "devicenameresolver", "version-string": "2016-06-26-0850d88fa6", - "port-version": 3, + "port-version": 4, "description": "a little library that resolves a path from a (virtual) device name.", - "supports": "windows & !uwp", + "supports": "windows & !uwp & !staticcrt", "dependencies": [ { "name": "vcpkg-cmake", From 19e736ac0a80719d5b4838fdd6114bc0af2f5208 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:41:03 +0200 Subject: [PATCH 04/41] epsilon --- ports/epsilon/portfile.cmake | 4 ++-- ports/epsilon/vcpkg.json | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake index 525974ab575546..2797aa1eced673 100644 --- a/ports/epsilon/portfile.cmake +++ b/ports/epsilon/portfile.cmake @@ -43,6 +43,6 @@ vcpkg_install_nmake( vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json index d19ef5749b4126..05ed1ca04104a7 100644 --- a/ports/epsilon/vcpkg.json +++ b/ports/epsilon/vcpkg.json @@ -1,10 +1,11 @@ { "name": "epsilon", "version-string": "0.9.2", - "port-version": 6, + "port-version": 7, "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", - "supports": "windows", + "license": "GPL-2.0-only OR LGPL-2.0-only", + "supports": "windows & !staticcrt", "dependencies": [ "libpopt" ] From 51ed0ef5897c9c85570ab42961413b2f2f532d65 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:41:55 +0200 Subject: [PATCH 05/41] fann --- ports/fann/portfile.cmake | 15 +++++++-------- ports/fann/vcpkg.json | 12 ++++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index 716bf3e8b94579..403b6eb8240135 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -12,12 +12,11 @@ vcpkg_from_github( fix-uwp-build.patch ) -set(INSTALL_BASE_DIR_DBG ${CURRENT_PACKAGES_DIR}/debug) -set(INSTALL_BASE_DIR_REL ${CURRENT_PACKAGES_DIR}) +set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug") +set(INSTALL_BASE_DIR_REL "${CURRENT_PACKAGES_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin @@ -50,12 +49,12 @@ vcpkg_configure_cmake( -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json index c4bc01717c8b4e..a5a9a466672fd5 100644 --- a/ports/fann/vcpkg.json +++ b/ports/fann/vcpkg.json @@ -1,7 +1,15 @@ { "name": "fann", "version": "2.2.0", - "port-version": 2, + "port-version": 3, "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", - "homepage": "https://github.com/libfann/fann" + "homepage": "https://github.com/libfann/fann", + "license": "LGPL-2.1", + "supports": "!static", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } From 70fda772eb86d7a458e7b4d856ffcee409f17f4d Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:44:02 +0200 Subject: [PATCH 06/41] cudnn license --- ports/cudnn/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index ed75e28a20348a..7e9ffc63073fda 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -4,7 +4,7 @@ "port-version": 7, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", - "license": "NVIDIA", + "license": null, "supports": "(windows & x64 & !uwp & !static) | (linux & x64) | (linux & arm64)", "dependencies": [ "cuda" From b47d88e6effc3c272ac0d41002e2c54c66a20bb2 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:45:06 +0200 Subject: [PATCH 07/41] devicenameresolver version --- ports/devicenameresolver/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index 10a13bac07a5ec..de7567b8af23ed 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "devicenameresolver", - "version-string": "2016-06-26-0850d88fa6", + "version": "2016-06-26-0850d88fa6", "port-version": 4, "description": "a little library that resolves a path from a (virtual) device name.", "supports": "windows & !uwp & !staticcrt", From 51e6c5f2f503f35aef5139a693aee8a38c4ad0df Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:46:10 +0200 Subject: [PATCH 08/41] epsilon --- ports/epsilon/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json index 05ed1ca04104a7..acfdb49e2e8694 100644 --- a/ports/epsilon/vcpkg.json +++ b/ports/epsilon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "epsilon", - "version-string": "0.9.2", + "version": "0.9.2", "port-version": 7, "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", From 8f52be3fa7a88869aec640cabea855fc9dae4db7 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:46:48 +0200 Subject: [PATCH 09/41] version --- versions/baseline.json | 10 +++++----- versions/c-/cppcms.json | 5 +++++ versions/c-/cudnn.json | 5 +++++ versions/d-/devicenameresolver.json | 5 +++++ versions/e-/epsilon.json | 5 +++++ versions/f-/fann.json | 5 +++++ 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a938c9640fcaa9..23152c118c6b0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1602,7 +1602,7 @@ }, "cppcms": { "baseline": "1.2.1", - "port-version": 4 + "port-version": 5 }, "cppcodec": { "baseline": "0.2", @@ -1742,7 +1742,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 6 + "port-version": 7 }, "cunit": { "baseline": "2.1.3", @@ -1854,7 +1854,7 @@ }, "devicenameresolver": { "baseline": "2016-06-26-0850d88fa6", - "port-version": 3 + "port-version": 4 }, "devil": { "baseline": "1.8.0", @@ -2098,7 +2098,7 @@ }, "epsilon": { "baseline": "0.9.2", - "port-version": 6 + "port-version": 7 }, "esaxx": { "baseline": "ca7cb332011ec37", @@ -2154,7 +2154,7 @@ }, "fann": { "baseline": "2.2.0", - "port-version": 2 + "port-version": 3 }, "farmhash": { "baseline": "1.1", diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index b476ab5426ee59..a17ff00df69504 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e8c1d684741e878e07297a9bf008f3b77bcfaa3", + "version": "1.2.1", + "port-version": 5 + }, { "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451", "version-string": "1.2.1", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 7c7b0ef9a93491..87603894ce48ac 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f520a4807c2a25084b2febff6821bceaf1b8091", + "version": "7.6.5", + "port-version": 7 + }, { "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653", "version": "7.6.5", diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index fe2447d1b9f9fb..bb7e9a5a40a6ba 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "424582337cf5dc88c2c828e298561c857e53a1a0", + "version": "2016-06-26-0850d88fa6", + "port-version": 4 + }, { "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1", "version-string": "2016-06-26-0850d88fa6", diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index ab89b1e6aa80d2..77d53ac828f89f 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "717af4862531c399b0b97d9fe6394d5e443b340a", + "version": "0.9.2", + "port-version": 7 + }, { "git-tree": "ad0883f9e090b404fcef27b3e4304df44472bf90", "version-string": "0.9.2", diff --git a/versions/f-/fann.json b/versions/f-/fann.json index f49c67fc995cf5..2fa3769d54e298 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73a0f3efce8fead814a2ea4814b20b26c2ce64c3", + "version": "2.2.0", + "port-version": 3 + }, { "git-tree": "9bff6da1b7043e1ab6e344c549a285b7101763e2", "version": "2.2.0", From b7430cd8727b43464f51b6e76ffbfc565baf85a1 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:47:14 +0200 Subject: [PATCH 10/41] Remove from ci baseline --- scripts/ci.baseline.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4b856f3bde0f72..06cd0150092f59 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -159,9 +159,6 @@ coolprop:x64-uwp=fail coroutine:arm-uwp=fail coroutine:x64-linux=fail coroutine:x64-uwp=fail -cppcms:x64-linux=fail -cppcms:x64-osx=fail -cppcms:x64-windows-static=fail cppfs:arm-uwp=fail cppfs:x64-uwp=fail cppmicroservices:arm64-windows=fail @@ -182,11 +179,6 @@ crashpad:x86-windows=fail ctemplate:x64-linux=fail ctemplate:x64-osx=fail cuda:x64-osx=fail -cudnn:arm64-windows=fail -cudnn:arm-uwp=fail -cudnn:x64-uwp=fail -cudnn:x64-windows-static=fail -cudnn:x86-windows=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip dbghelp:arm64-windows=skip @@ -198,7 +190,6 @@ dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:x64-uwp=fail -devicenameresolver:x64-windows-static=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip @@ -248,8 +239,6 @@ embree2:x64-linux=skip embree2:x64-osx=skip epsilon:arm-uwp=fail epsilon:x64-uwp=fail -epsilon:x64-windows-static=fail -fann:x64-windows-static=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail From febbf22113580ea74871f19c2afe9070206a97b8 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:51:21 +0200 Subject: [PATCH 11/41] license --- ports/devicenameresolver/vcpkg.json | 1 + ports/fann/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index de7567b8af23ed..1262bba990e3ce 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -3,6 +3,7 @@ "version": "2016-06-26-0850d88fa6", "port-version": 4, "description": "a little library that resolves a path from a (virtual) device name.", + "license": null, "supports": "windows & !uwp & !staticcrt", "dependencies": [ { diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json index a5a9a466672fd5..35e539cfc7ebf7 100644 --- a/ports/fann/vcpkg.json +++ b/ports/fann/vcpkg.json @@ -4,7 +4,7 @@ "port-version": 3, "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", "homepage": "https://github.com/libfann/fann", - "license": "LGPL-2.1", + "license": "LGPL-2.1-only", "supports": "!static", "dependencies": [ { From 6ba526201fbe27f1be487934c74ebaf908fbce01 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 11:52:10 +0200 Subject: [PATCH 12/41] version --- versions/d-/devicenameresolver.json | 2 +- versions/f-/fann.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index bb7e9a5a40a6ba..8315d60687414f 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "424582337cf5dc88c2c828e298561c857e53a1a0", + "git-tree": "4662b674184748ac5dc49015852361920a88b848", "version": "2016-06-26-0850d88fa6", "port-version": 4 }, diff --git a/versions/f-/fann.json b/versions/f-/fann.json index 2fa3769d54e298..ee1c02c62a9d0e 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "73a0f3efce8fead814a2ea4814b20b26c2ce64c3", + "git-tree": "aa16960a4d6d8e991d5be39ba7103174e0044a99", "version": "2.2.0", "port-version": 3 }, From 2e46d27832d2f6bca43e126d115b2fca10d7b091 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 12:31:44 +0200 Subject: [PATCH 13/41] libbf --- ports/epsilon/portfile.cmake | 3 +++ ports/libbf/portfile.cmake | 17 +++++------------ ports/libbf/vcpkg.json | 14 +++++++++++--- scripts/ci.baseline.txt | 7 ------- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake index 2797aa1eced673..ea76cc63dc3630 100644 --- a/ports/epsilon/portfile.cmake +++ b/ports/epsilon/portfile.cmake @@ -43,6 +43,9 @@ vcpkg_install_nmake( vcpkg_copy_pdbs() +vcpkg_copy_tools(TOOL_NAMES epsilon SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake index a50abed942aa60..7aa235a24f71cb 100644 --- a/ports/libbf/portfile.cmake +++ b/ports/libbf/portfile.cmake @@ -1,7 +1,3 @@ -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "libbf does not support MSVC") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mavam/libbf @@ -10,16 +6,13 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbf) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbf/COPYING ${CURRENT_PACKAGES_DIR}/share/libbf/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libbf/vcpkg.json b/ports/libbf/vcpkg.json index 1b184fddf45f2d..ec43ed92aef425 100644 --- a/ports/libbf/vcpkg.json +++ b/ports/libbf/vcpkg.json @@ -1,6 +1,14 @@ { "name": "libbf", - "version-string": "1.0.0", - "port-version": 2, - "description": "Bloom filters for C++11." + "version": "1.0.0", + "port-version": 3, + "description": "Bloom filters for C++11.", + "license": "BSD-3-Clause", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 06cd0150092f59..868c9e591db76e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -416,13 +416,6 @@ leveldb:arm-uwp=fail leveldb:x64-uwp=fail libaiff:x64-linux=fail libarchive:arm-uwp=fail -libbf:arm64-windows=fail -libbf:arm-uwp=fail -libbf:x64-uwp=fail -libbf:x64-windows=fail -libbf:x64-windows-static=fail -libbf:x64-windows-static-md=fail -libbf:x86-windows=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf From 2187b51df11e332cc923dd2cd1ae66dfe8ff299d Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 12:33:05 +0200 Subject: [PATCH 14/41] version --- versions/baseline.json | 2 +- versions/e-/epsilon.json | 2 +- versions/l-/libbf.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 23152c118c6b0d..aa97d5770549d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3446,7 +3446,7 @@ }, "libbf": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "libbson": { "baseline": "1.17.6", diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index 77d53ac828f89f..fca6516d4cf3e7 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "717af4862531c399b0b97d9fe6394d5e443b340a", + "git-tree": "770bd5c543bccf17c46b5d44fd288128008bde27", "version": "0.9.2", "port-version": 7 }, diff --git a/versions/l-/libbf.json b/versions/l-/libbf.json index d338b8248d5d60..183b294f445170 100644 --- a/versions/l-/libbf.json +++ b/versions/l-/libbf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c699adb88cb4cf15b0fb52cb9e506bc91672bf2", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "b44ae45673f953a9aa87a1df8bdc04c6a4201aef", "version-string": "1.0.0", From b90266529e9d2374a041dc3faa8ab675992d3ccf Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:33:00 +0200 Subject: [PATCH 15/41] Why are those ports unsupported on static? I think because of failing post build lint --- ports/cppcms/portfile.cmake | 2 +- ports/cudnn/portfile.cmake | 2 +- ports/epsilon/portfile.cmake | 2 +- ports/fann/portfile.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index efc993d569da1e..a506d4bd0d9f10 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 28da85e460f7b3..8ceaa38879ba06 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) set(MINIMUM_CUDNN_VERSION "7.6.5") diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake index ea76cc63dc3630..918df7d8766819 100644 --- a/ports/epsilon/portfile.cmake +++ b/ports/epsilon/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index 403b6eb8240135..56980861f685cf 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -1,5 +1,5 @@ # Official design -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH From b3b230244e8afa94ec73203d5143f0a7ee7e5720 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:37:53 +0200 Subject: [PATCH 16/41] version --- versions/c-/cppcms.json | 2 +- versions/c-/cudnn.json | 2 +- versions/e-/epsilon.json | 2 +- versions/f-/fann.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index a17ff00df69504..a8882d2ebf0ddf 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3e8c1d684741e878e07297a9bf008f3b77bcfaa3", + "git-tree": "22f52d82f20d7d67fc2e4714df718fa363e12bed", "version": "1.2.1", "port-version": 5 }, diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 87603894ce48ac..3b9d620b87a14e 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3f520a4807c2a25084b2febff6821bceaf1b8091", + "git-tree": "eac69210d17281676ac80c5f262e674e49dcd3a3", "version": "7.6.5", "port-version": 7 }, diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index fca6516d4cf3e7..c5fee0caf20321 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "770bd5c543bccf17c46b5d44fd288128008bde27", + "git-tree": "ae6c5ff3c482e36a74334087042020d74c508181", "version": "0.9.2", "port-version": 7 }, diff --git a/versions/f-/fann.json b/versions/f-/fann.json index ee1c02c62a9d0e..ec5f2b79d52311 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aa16960a4d6d8e991d5be39ba7103174e0044a99", + "git-tree": "a18c3fc66eb4f234a4435a41d7628bc571c14710", "version": "2.2.0", "port-version": 3 }, From 5b2152d4b6e7c7d4ec767ffe23950c8d9721e6f6 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:45:24 +0200 Subject: [PATCH 17/41] cppcms --- ports/cppcms/portfile.cmake | 3 +++ ports/cppcms/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index a506d4bd0d9f10..ed06d9d91f787b 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -9,11 +9,14 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON2) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYTHON=${PYTHON2} # Switch to python3 on the next update -DUSE_WINDOWS6_API=ON + -DDISABLE_DYNAMIC=${DISABLE_DYNAMIC} ) vcpkg_cmake_install() diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 7a66c04b08e8d6..3cb75ca6a62c55 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -5,7 +5,7 @@ "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", "license": "MIT", - "supports": "!(linux | osx | (windows & staticcrt))", + "supports": "!(linux | osx)", "dependencies": [ "icu", "openssl", From 6faa4129029cb3cf967655db2eec0a12c506c49b Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:45:53 +0200 Subject: [PATCH 18/41] version --- versions/c-/cppcms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index a8882d2ebf0ddf..f98c828662218e 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "22f52d82f20d7d67fc2e4714df718fa363e12bed", + "git-tree": "9488d8e8c7570319d67a2129a63945aa232406d7", "version": "1.2.1", "port-version": 5 }, From d24c2ca7c04cb78f2e2539e043105441da6d671d Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:49:37 +0200 Subject: [PATCH 19/41] epsilon --- ports/cppcms/portfile.cmake | 2 -- ports/epsilon/portfile.cmake | 6 ++++-- ports/epsilon/vcpkg.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index ed06d9d91f787b..0ec258024dfc5f 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -1,5 +1,3 @@ -#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artyom-beilis/cppcms diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake index 918df7d8766819..e753526972272b 100644 --- a/ports/epsilon/portfile.cmake +++ b/ports/epsilon/portfile.cmake @@ -1,5 +1,3 @@ -#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO epsilon-project/epsilon @@ -48,4 +46,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json index acfdb49e2e8694..7973271eaaeff2 100644 --- a/ports/epsilon/vcpkg.json +++ b/ports/epsilon/vcpkg.json @@ -5,7 +5,7 @@ "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", "license": "GPL-2.0-only OR LGPL-2.0-only", - "supports": "windows & !staticcrt", + "supports": "windows", "dependencies": [ "libpopt" ] From 4f8c4984c871e707d23935d825987a0c03197358 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:50:10 +0200 Subject: [PATCH 20/41] version --- versions/c-/cppcms.json | 2 +- versions/e-/epsilon.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index f98c828662218e..45a8f9ed09f934 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9488d8e8c7570319d67a2129a63945aa232406d7", + "git-tree": "0c6588e0abf7017ba906fd31c9b3fb0c2d6e04e2", "version": "1.2.1", "port-version": 5 }, diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index c5fee0caf20321..39b536af231daa 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ae6c5ff3c482e36a74334087042020d74c508181", + "git-tree": "800dbc074727df7eded3e5707b828be676bb5943", "version": "0.9.2", "port-version": 7 }, From fec69f527a4dbcbd1a2461091110f9ab0b64a315 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:58:35 +0200 Subject: [PATCH 21/41] typo --- ports/cppcms/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 0ec258024dfc5f..131ba64a1e505f 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_configure( OPTIONS -DPYTHON=${PYTHON2} # Switch to python3 on the next update -DUSE_WINDOWS6_API=ON - -DDISABLE_DYNAMIC=${DISABLE_DYNAMIC} + -DDISABLE_SHARED=${DISABLE_DYNAMIC} ) vcpkg_cmake_install() From 35cc2258305847dd56bbd45749c14be3533a007d Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 17:58:48 +0200 Subject: [PATCH 22/41] version --- versions/c-/cppcms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index 45a8f9ed09f934..cbe3b964747f34 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0c6588e0abf7017ba906fd31c9b3fb0c2d6e04e2", + "git-tree": "fcb31f329e4ffeea6d26d0436676281ca5726488", "version": "1.2.1", "port-version": 5 }, From dca8cd2891c5791ddc1e069f60115071e19ccdab Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:01:02 +0200 Subject: [PATCH 23/41] test on static --- ports/cudnn/vcpkg.json | 2 +- ports/fann/vcpkg.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index 7e9ffc63073fda..2918c45688babf 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -5,7 +5,7 @@ "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", "license": null, - "supports": "(windows & x64 & !uwp & !static) | (linux & x64) | (linux & arm64)", + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)", "dependencies": [ "cuda" ] diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json index 35e539cfc7ebf7..03f16620c3fae4 100644 --- a/ports/fann/vcpkg.json +++ b/ports/fann/vcpkg.json @@ -5,7 +5,6 @@ "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", "homepage": "https://github.com/libfann/fann", "license": "LGPL-2.1-only", - "supports": "!static", "dependencies": [ { "name": "vcpkg-cmake", From 1ad05ccbf6fd053a1c87fc0d8f9d860c5d74645c Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:01:34 +0200 Subject: [PATCH 24/41] version --- versions/c-/cudnn.json | 2 +- versions/f-/fann.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 3b9d620b87a14e..b04a3d7010f1b9 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eac69210d17281676ac80c5f262e674e49dcd3a3", + "git-tree": "f126beb380b1782cac24ebcec7f8de7673fd1ae4", "version": "7.6.5", "port-version": 7 }, diff --git a/versions/f-/fann.json b/versions/f-/fann.json index ec5f2b79d52311..4d6fe6be37d3bc 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a18c3fc66eb4f234a4435a41d7628bc571c14710", + "git-tree": "3d9fd0c1e6274e0d4aac637979708101a664742c", "version": "2.2.0", "port-version": 3 }, From f87ca2639baf832c0aaec987f3b1a8bb95ff2d14 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:13:20 +0200 Subject: [PATCH 25/41] cppcms not supported on static --- ports/cppcms/portfile.cmake | 2 ++ ports/cppcms/vcpkg.json | 2 +- ports/fann/portfile.cmake | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 131ba64a1e505f..189d8bdb5ea5a3 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artyom-beilis/cppcms diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 3cb75ca6a62c55..8340ea8746e466 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -5,7 +5,7 @@ "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", "license": "MIT", - "supports": "!(linux | osx)", + "supports": "!(linux | osx | (windows & static))", "dependencies": [ "icu", "openssl", diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index 56980861f685cf..b74433baf2f656 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -1,6 +1,3 @@ -# Official design -#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libfann/fann @@ -57,4 +54,8 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 454e3b9c8886972df5b980245383882b49287246 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:13:58 +0200 Subject: [PATCH 26/41] version --- versions/c-/cppcms.json | 2 +- versions/f-/fann.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index cbe3b964747f34..1909a7ab925449 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fcb31f329e4ffeea6d26d0436676281ca5726488", + "git-tree": "e944f382af84e4fc42f0371428c341b2c599bbe3", "version": "1.2.1", "port-version": 5 }, diff --git a/versions/f-/fann.json b/versions/f-/fann.json index 4d6fe6be37d3bc..e005396d3d4a4a 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3d9fd0c1e6274e0d4aac637979708101a664742c", + "git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830", "version": "2.2.0", "port-version": 3 }, From a186012165b4d8b8499633706b7a34756fa101f7 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:16:39 +0200 Subject: [PATCH 27/41] cudnn --- ports/cudnn/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 8ceaa38879ba06..b5ebb3239d24c7 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -1,5 +1,3 @@ -#vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - set(MINIMUM_CUDNN_VERSION "7.6.5") include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") From ed737779b18edebab430458cb1e44e26f2675072 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:17:41 +0200 Subject: [PATCH 28/41] device --- ports/devicenameresolver/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index 1262bba990e3ce..affd090d5734fc 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -4,7 +4,7 @@ "port-version": 4, "description": "a little library that resolves a path from a (virtual) device name.", "license": null, - "supports": "windows & !uwp & !staticcrt", + "supports": "windows & !uwp", "dependencies": [ { "name": "vcpkg-cmake", From beb23c77b2e09c086da15910d7be91c230b9833c Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:19:34 +0200 Subject: [PATCH 29/41] version --- versions/c-/cudnn.json | 2 +- versions/d-/devicenameresolver.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index b04a3d7010f1b9..3ef9d240d946b3 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f126beb380b1782cac24ebcec7f8de7673fd1ae4", + "git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588", "version": "7.6.5", "port-version": 7 }, diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index 8315d60687414f..b58c6a0ac35eea 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4662b674184748ac5dc49015852361920a88b848", + "git-tree": "eb850ba91f74addd0aa9ac66853f9fdd68031423", "version": "2016-06-26-0850d88fa6", "port-version": 4 }, From 049a40af9dc37cf5399bfb3a3fbd09c503190148 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:45:44 +0200 Subject: [PATCH 30/41] try again... --- ports/devicenameresolver/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake index b08e2f681d90e4..027cf63f363c2d 100644 --- a/ports/devicenameresolver/portfile.cmake +++ b/ports/devicenameresolver/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO mrexodia/devicenameresolver From 2a9fb612d9f18fd4ed499b0a9477a9c7d2a1dc82 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 5 Jun 2022 18:45:56 +0200 Subject: [PATCH 31/41] version --- versions/d-/devicenameresolver.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index b58c6a0ac35eea..9be1c74c0942f3 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eb850ba91f74addd0aa9ac66853f9fdd68031423", + "git-tree": "4d251e0424284ebf60d83d68547e38b9eb1f8bbe", "version": "2016-06-26-0850d88fa6", "port-version": 4 }, From 6713f6751af7757d3c62bec4b707e2005d77210d Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:31:12 +0200 Subject: [PATCH 32/41] version-date --- ports/devicenameresolver/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index affd090d5734fc..97bcbb4f40b5ea 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "devicenameresolver", - "version": "2016-06-26-0850d88fa6", + "version-date": "2016-06-26", "port-version": 4, "description": "a little library that resolves a path from a (virtual) device name.", "license": null, From bb111a3fcb478e1c654a00b9c91e1911890beded Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:33:37 +0200 Subject: [PATCH 33/41] version --- versions/baseline.json | 2 +- versions/d-/devicenameresolver.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index aa97d5770549d7..b07783b333e4b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1853,7 +1853,7 @@ "port-version": 5 }, "devicenameresolver": { - "baseline": "2016-06-26-0850d88fa6", + "baseline": "2016-06-26", "port-version": 4 }, "devil": { diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index 9be1c74c0942f3..3f28e102babcb0 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "4d251e0424284ebf60d83d68547e38b9eb1f8bbe", - "version": "2016-06-26-0850d88fa6", + "git-tree": "bb4e35f532b95841344719e4ab90027a2796d5d4", + "version-date": "2016-06-26", "port-version": 4 }, { From fee6db85e01ca6931fa787c70f254d3ba17ec486 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:24:54 +0200 Subject: [PATCH 34/41] [cppcms] Patch out tests & examples --- ports/cppcms/no-tests-and-examples.patch | 50 ++++++++++++++++++++++++ ports/cppcms/portfile.cmake | 8 ++-- 2 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 ports/cppcms/no-tests-and-examples.patch diff --git a/ports/cppcms/no-tests-and-examples.patch b/ports/cppcms/no-tests-and-examples.patch new file mode 100644 index 00000000000000..a37530f5cd4a78 --- /dev/null +++ b/ports/cppcms/no-tests-and-examples.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ce0d53..2da4f95 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED) + endif(NOT DISABLE_SHARED) + + +- ++if(FALSE) + add_executable(hello_world src/hello_world.cpp skin1.cpp skin2.cpp) + target_link_libraries(hello_world ${CPPCMS_LIB}) ++endif() + + if(NOT DISABLE_TCPCACHE) + add_executable(cppcms_scale src/cache_server_main.cpp) +@@ -710,7 +711,7 @@ endif(DISABLE_SHARED) + ######################################### + # Tests + ######################################### +- ++if(FALSE) + set(ALL_TESTS + form_test + proto_test +@@ -775,7 +776,7 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test) + if(NOT DISABLE_GZIP) + target_link_libraries(response_test ${ZLIB}) + endif() +- ++endif() + ##################################### + # End of tests + ##################################### +@@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include + ############# + + +- ++if(FALSE) + set(CNF "${CMAKE_CURRENT_SOURCE_DIR}/tests") + + add_test(base64_test base64_test) +@@ -1103,5 +1104,5 @@ if(NOT IS_WINDOWS) + PROPERTIES TIMEOUT 120) + + endif() +- ++endif() + diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 189d8bdb5ea5a3..567b7397cc5738 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REPO artyom-beilis/cppcms REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df + PATCHES + no-tests-and-examples.patch ) vcpkg_find_acquire_program(PYTHON2) @@ -20,11 +22,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(GLOB EXE_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") -file(REMOVE ${EXE_DEBUG_FILES}) -file(GLOB EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe") -file(REMOVE ${EXE_FILES}) +vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN) file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From d7499f3d5b31677d606fd78fe6441b559e770021 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:25:42 +0200 Subject: [PATCH 35/41] version --- versions/c-/cppcms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index 1909a7ab925449..c8c9c22c0714e6 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e944f382af84e4fc42f0371428c341b2c599bbe3", + "git-tree": "912e23145f72bdb40a0b3cda5446815c026163f3", "version": "1.2.1", "port-version": 5 }, From 6e0db25133d4ec375ded83835e0316a64ba4cf4e Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:53:54 +0200 Subject: [PATCH 36/41] Fix patch --- ports/cppcms/no-tests-and-examples.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/cppcms/no-tests-and-examples.patch b/ports/cppcms/no-tests-and-examples.patch index a37530f5cd4a78..7d8e67bdfe0dcf 100644 --- a/ports/cppcms/no-tests-and-examples.patch +++ b/ports/cppcms/no-tests-and-examples.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ce0d53..2da4f95 100644 +index 5ce0d53..5b432c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED) @@ -23,7 +23,7 @@ index 5ce0d53..2da4f95 100644 set(ALL_TESTS form_test proto_test -@@ -775,7 +776,7 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test) +@@ -775,14 +776,14 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test) if(NOT DISABLE_GZIP) target_link_libraries(response_test ${ZLIB}) endif() @@ -32,6 +32,14 @@ index 5ce0d53..2da4f95 100644 ##################################### # End of tests ##################################### + + # These are use export + if(IS_WINDOWS AND NOT DISABLE_SHARED) +- set_target_properties(${ALL_TESTS} hello_world cppcms PROPERTIES ++ set_target_properties(${ALL_TESTS} cppcms PROPERTIES + COMPILE_DEFINITIONS DLL_EXPORT) + endif() + @@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include ############# From 9459a0e93231df79e9161646a3cd4a192d6171db Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:54:14 +0200 Subject: [PATCH 37/41] version --- versions/c-/cppcms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index c8c9c22c0714e6..ba7b878e038804 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "912e23145f72bdb40a0b3cda5446815c026163f3", + "git-tree": "862c9e321097f203f17c5145a2fb2ef234890d9b", "version": "1.2.1", "port-version": 5 }, From 97b0784b7935acd6cd74eb576cddeaa952670bc6 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:59:29 +0200 Subject: [PATCH 38/41] remove debug include --- ports/cppcms/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 567b7397cc5738..799eb07f31fbed 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -25,4 +25,6 @@ vcpkg_cmake_install() vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From c2627a2b8b48dee0f10db77ca9f3db29c4dc1396 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 8 Jun 2022 22:59:44 +0200 Subject: [PATCH 39/41] version --- versions/c-/cppcms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index ba7b878e038804..24bbb4d29e91d1 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "862c9e321097f203f17c5145a2fb2ef234890d9b", + "git-tree": "f7a022f609cb9b8826f9b91540d46347116e6090", "version": "1.2.1", "port-version": 5 }, From 081ab67da32e9c1d1f9c140784a188f2ad6fc6d8 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 15 Jun 2022 23:25:34 +0200 Subject: [PATCH 40/41] [cppcms] copy pdbs --- ports/cppcms/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 799eb07f31fbed..df656168dc926f 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN) From 63badfa3bce074a70121c0b4d410a39585fa05b4 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 15 Jun 2022 23:26:16 +0200 Subject: [PATCH 41/41] version --- versions/c-/cppcms.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index 24bbb4d29e91d1..8086bb93bdbfd8 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f7a022f609cb9b8826f9b91540d46347116e6090", + "git-tree": "33ff6dbb307c2baceec0a21f05e098c0d15a8f88", "version": "1.2.1", "port-version": 5 },