From eee6cd543d6082ba4065886d382d1e4b04ba6670 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Mon, 23 Aug 2021 15:04:37 +0300 Subject: [PATCH 01/10] add kwsys port --- ports/kwsys/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/kwsys/vcpkg.json | 6 ++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/kwsys/portfile.cmake create mode 100644 ports/kwsys/vcpkg.json diff --git a/ports/kwsys/portfile.cmake b/ports/kwsys/portfile.cmake new file mode 100644 index 00000000000000..a579ddc045cec0 --- /dev/null +++ b/ports/kwsys/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.kitware.com + OUT_SOURCE_PATH SOURCE_PATH + REPO utils/kwsys + REF dbc94f37f9821899aad441bcab525ad96a3f30dc #2021-08-06 + SHA512 98441866fd51f2d4d3974d3c37d4456ce9e50c6f6c2ab0691e55b268907611ef061562fc30b1baa42aa195caf2281aa0e1e0799abc545fe6dae70efe2050ea50 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DKWSYS_INSTALL_INCLUDE_DIR=${CURRENT_PACKAGES_DIR}/include + OPTIONS_RELEASE + -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/bin + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/lib + OPTIONS_DEBUG + -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug/bin + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug/lib +) + +vcpkg_install_cmake() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json new file mode 100644 index 00000000000000..613497bb8c1ed8 --- /dev/null +++ b/ports/kwsys/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "kwsys", + "version-date": "2021-08-06", + "description": "Provides platform-independent APIs to many common system features", + "homepage": "https://gitlab.kitware.com/utils/kwsys" +} From 7febee679fb8d69cb05473dd18023d57aa62c988 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Mon, 23 Aug 2021 15:13:00 +0300 Subject: [PATCH 02/10] ./vcpkg x-add-version --all --- versions/baseline.json | 4 ++++ versions/k-/kwsys.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/k-/kwsys.json diff --git a/versions/baseline.json b/versions/baseline.json index a4cd4e99dae634..7d5441326f6047 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3004,6 +3004,10 @@ "baseline": "2019-08-06", "port-version": 0 }, + "kwsys": { + "baseline": "2021-08-06", + "port-version": 0 + }, "lapack": { "baseline": "3", "port-version": 1 diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json new file mode 100644 index 00000000000000..a8dad9e1570614 --- /dev/null +++ b/versions/k-/kwsys.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4af210c9dac21c8c469a1f201f207a3dc4d12ec4", + "version-date": "2021-08-06", + "port-version": 0 + } + ] +} From 52e7c3bc0eaab05ab23b456a1ad1797d2a41d492 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Mon, 23 Aug 2021 23:44:12 +0300 Subject: [PATCH 03/10] unsupport uwp --- ports/kwsys/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json index 613497bb8c1ed8..673cc2cb17ad0a 100644 --- a/ports/kwsys/vcpkg.json +++ b/ports/kwsys/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kwsys", "version-date": "2021-08-06", + "supports": "!uwp", "description": "Provides platform-independent APIs to many common system features", "homepage": "https://gitlab.kitware.com/utils/kwsys" } From 87ec077c552a85ed39248b641f1af8fb2ac455db Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Mon, 23 Aug 2021 23:53:56 +0300 Subject: [PATCH 04/10] ./vcpkg x-add-version --all --- ports/kwsys/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/k-/kwsys.json | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json index 673cc2cb17ad0a..71697bf5c4db40 100644 --- a/ports/kwsys/vcpkg.json +++ b/ports/kwsys/vcpkg.json @@ -1,7 +1,8 @@ { "name": "kwsys", "version-date": "2021-08-06", - "supports": "!uwp", + "port-version": 1, "description": "Provides platform-independent APIs to many common system features", - "homepage": "https://gitlab.kitware.com/utils/kwsys" + "homepage": "https://gitlab.kitware.com/utils/kwsys", + "supports": "!uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index 7d5441326f6047..702084c0caebeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3006,7 +3006,7 @@ }, "kwsys": { "baseline": "2021-08-06", - "port-version": 0 + "port-version": 1 }, "lapack": { "baseline": "3", diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index a8dad9e1570614..31595b3007a38f 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77fa4105a4c86e816443da5649a1dcd23eb0e4c7", + "version-date": "2021-08-06", + "port-version": 1 + }, { "git-tree": "4af210c9dac21c8c469a1f201f207a3dc4d12ec4", "version-date": "2021-08-06", From 68d1d272ddd1ef7de2bf47930af014b6c3011201 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Tue, 24 Aug 2021 00:10:24 +0300 Subject: [PATCH 05/10] Fix versions for port --- ports/kwsys/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kwsys.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json index 71697bf5c4db40..6f3710e4f98e68 100644 --- a/ports/kwsys/vcpkg.json +++ b/ports/kwsys/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kwsys", "version-date": "2021-08-06", - "port-version": 1, + "port-version": 2, "description": "Provides platform-independent APIs to many common system features", "homepage": "https://gitlab.kitware.com/utils/kwsys", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 702084c0caebeb..eee805665e71a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3006,7 +3006,7 @@ }, "kwsys": { "baseline": "2021-08-06", - "port-version": 1 + "port-version": 2 }, "lapack": { "baseline": "3", diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index 31595b3007a38f..52c87f07fb717a 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdceb02c65c7c8278dbd0fb3be946c504193bc04", + "version-date": "2021-08-06", + "port-version": 2 + }, { "git-tree": "77fa4105a4c86e816443da5649a1dcd23eb0e4c7", "version-date": "2021-08-06", From 48aa7187bc62c634961693462ceebcf0f92acce8 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Tue, 24 Aug 2021 00:15:11 +0300 Subject: [PATCH 06/10] Update version database --- versions/k-/kwsys.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index 52c87f07fb717a..4e26068125c3c7 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bdceb02c65c7c8278dbd0fb3be946c504193bc04", + "git-tree": "3fb2fdfc0e8ecaa32c7173365698c73827add230", "version-date": "2021-08-06", "port-version": 2 }, From 1e331ed754254383b66342bdff89b753ff72b416 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Tue, 24 Aug 2021 11:30:05 +0300 Subject: [PATCH 07/10] corrections --- ports/kwsys/portfile.cmake | 12 +++++++----- ports/kwsys/vcpkg.json | 13 +++++++++++-- versions/k-/kwsys.json | 12 +----------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ports/kwsys/portfile.cmake b/ports/kwsys/portfile.cmake index a579ddc045cec0..aa7ab59a1658f1 100644 --- a/ports/kwsys/portfile.cmake +++ b/ports/kwsys/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + vcpkg_from_gitlab( GITLAB_URL https://gitlab.kitware.com OUT_SOURCE_PATH SOURCE_PATH @@ -7,9 +9,8 @@ vcpkg_from_gitlab( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKWSYS_INSTALL_INCLUDE_DIR=${CURRENT_PACKAGES_DIR}/include OPTIONS_RELEASE @@ -17,10 +18,11 @@ vcpkg_configure_cmake( -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/lib OPTIONS_DEBUG -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug/bin - -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug/lib + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug/lib ) -vcpkg_install_cmake() +vcpkg_cmake_install() + # Handle copyright file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json index 6f3710e4f98e68..deebe5309eefbd 100644 --- a/ports/kwsys/vcpkg.json +++ b/ports/kwsys/vcpkg.json @@ -1,8 +1,17 @@ { "name": "kwsys", "version-date": "2021-08-06", - "port-version": 2, "description": "Provides platform-independent APIs to many common system features", "homepage": "https://gitlab.kitware.com/utils/kwsys", - "supports": "!uwp" + "supports": "!uwp", + "dependencise": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index 4e26068125c3c7..6c0672f05a2214 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -3,17 +3,7 @@ { "git-tree": "3fb2fdfc0e8ecaa32c7173365698c73827add230", "version-date": "2021-08-06", - "port-version": 2 - }, - { - "git-tree": "77fa4105a4c86e816443da5649a1dcd23eb0e4c7", - "version-date": "2021-08-06", - "port-version": 1 - }, - { - "git-tree": "4af210c9dac21c8c469a1f201f207a3dc4d12ec4", - "version-date": "2021-08-06", "port-version": 0 } ] -} +} \ No newline at end of file From c285db0bfea4bdc09bcc5e623a7db5d42c3f4812 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Tue, 24 Aug 2021 11:36:23 +0300 Subject: [PATCH 08/10] corrections2 --- ports/kwsys/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kwsys.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json index deebe5309eefbd..b45350d738d937 100644 --- a/ports/kwsys/vcpkg.json +++ b/ports/kwsys/vcpkg.json @@ -4,7 +4,7 @@ "description": "Provides platform-independent APIs to many common system features", "homepage": "https://gitlab.kitware.com/utils/kwsys", "supports": "!uwp", - "dependencise": [ + "dependencies": [ { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index eee805665e71a4..7d5441326f6047 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3006,7 +3006,7 @@ }, "kwsys": { "baseline": "2021-08-06", - "port-version": 2 + "port-version": 0 }, "lapack": { "baseline": "3", diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index 6c0672f05a2214..e9a0fd6de6439d 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "3fb2fdfc0e8ecaa32c7173365698c73827add230", + "git-tree": "98f3d732e2481973fc7fe2aa6c9d473d7e320558", "version-date": "2021-08-06", "port-version": 0 } ] -} \ No newline at end of file +} From 7394aa98d660cf19ec8457f4432dc0d0960c3915 Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Tue, 24 Aug 2021 11:51:05 +0300 Subject: [PATCH 09/10] corrections3 --- ports/kwsys/portfile.cmake | 2 +- versions/k-/kwsys.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/kwsys/portfile.cmake b/ports/kwsys/portfile.cmake index aa7ab59a1658f1..b676a4a13d53e0 100644 --- a/ports/kwsys/portfile.cmake +++ b/ports/kwsys/portfile.cmake @@ -25,4 +25,4 @@ vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index e9a0fd6de6439d..1927b037bfb7fc 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "98f3d732e2481973fc7fe2aa6c9d473d7e320558", + "git-tree": "56ddc9e9b203d9bf969e93d40333ff7ad0d66924", "version-date": "2021-08-06", "port-version": 0 } From 6bb30e41faf3078e3b7df695780ec3c7887f0bcd Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Tue, 24 Aug 2021 12:23:28 +0300 Subject: [PATCH 10/10] update hash --- versions/k-/kwsys.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json index 1927b037bfb7fc..fd3fb9fa7a6304 100644 --- a/versions/k-/kwsys.json +++ b/versions/k-/kwsys.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "56ddc9e9b203d9bf969e93d40333ff7ad0d66924", + "git-tree": "376ae3a199ad4fdaad235b6e01b92ed217388550", "version-date": "2021-08-06", "port-version": 0 }