From 2e5f66f0eb9f993caef569e669fd9c0622a027d5 Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Fri, 9 Sep 2022 16:56:53 +0200 Subject: [PATCH 01/10] [stronk] Initial port --- ports/stronk/portfile.cmake | 21 +++++++++++++++++++++ ports/stronk/vcpkg.json | 34 ++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/stronk.json | 8 ++++++++ 4 files changed, 67 insertions(+) create mode 100644 ports/stronk/portfile.cmake create mode 100644 ports/stronk/vcpkg.json create mode 100644 versions/s-/stronk.json diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake new file mode 100644 index 00000000000000..ca13398c28c757 --- /dev/null +++ b/ports/stronk/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL https://github.com/twig-energy/stronk + REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 + HEAD_REF main +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug +) + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/ports/stronk/vcpkg.json b/ports/stronk/vcpkg.json new file mode 100644 index 00000000000000..deec0ad8469ca1 --- /dev/null +++ b/ports/stronk/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "stronk", + "version-semver": "0.2.0", + "description": "An easy to customize, strong type library with built in support for unit-like behavior", + "homepage": "https://github.com/twig-energy/stronk", + "license": "MIT", + "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", + "dependencies": [ + { + "name": "boost-type-index", + "version>=": "1.78.0" + } + ], + "features": { + "abseil": { + "description": "Dependencies for abseil extension", + "dependencies": [ + { + "name": "abseil", + "version>=": "20211102.1" + } + ] + }, + "fmt": { + "description": "Dependencies for fmt extension", + "dependencies": [ + { + "name": "fmt", + "version>=": "9.0.0" + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 8dd226218e4d96..4b8ce832dd2e33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6804,6 +6804,10 @@ "baseline": "1.6.0", "port-version": 0 }, + "stronk": { + "baseline": "0.2.0", + "port-version": 0 + }, "strtk": { "baseline": "2020-09-14", "port-version": 1 diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json new file mode 100644 index 00000000000000..059a003bec107b --- /dev/null +++ b/versions/s-/stronk.json @@ -0,0 +1,8 @@ +{ + "versions": [ + { + "version-semver": "0.2.0", + "git-tree": "bc124b587321ac615d96a5f6c5b48869c6a50001" + } + ] +} From 53c191e76ffc0fa7e07f9bbaaca448ec8b28791c Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Tue, 13 Sep 2022 09:37:06 +0200 Subject: [PATCH 02/10] Review fixes --- ports/stronk/portfile.cmake | 6 +++--- ports/stronk/vcpkg.json | 8 ++++++++ versions/s-/stronk.json | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake index ca13398c28c757..073ba4e240285a 100644 --- a/ports/stronk/portfile.cmake +++ b/ports/stronk/portfile.cmake @@ -5,14 +5,14 @@ vcpkg_from_git( HEAD_REF main ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug + "${CURRENT_PACKAGES_DIR}/debug" ) file( diff --git a/ports/stronk/vcpkg.json b/ports/stronk/vcpkg.json index deec0ad8469ca1..56ca03885f5b6d 100644 --- a/ports/stronk/vcpkg.json +++ b/ports/stronk/vcpkg.json @@ -9,6 +9,14 @@ { "name": "boost-type-index", "version>=": "1.78.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json index 059a003bec107b..4b47aacba24b53 100644 --- a/versions/s-/stronk.json +++ b/versions/s-/stronk.json @@ -2,7 +2,7 @@ "versions": [ { "version-semver": "0.2.0", - "git-tree": "bc124b587321ac615d96a5f6c5b48869c6a50001" + "git-tree": "87898e43d9de37fe271979e5ce4ba23e15c56e81" } ] } From 2713fcfbc8fe7effb8f6b905b46b77c9b3bac30b Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Tue, 13 Sep 2022 10:40:33 +0200 Subject: [PATCH 03/10] Fixed added builtin-baseline which is not neccesary for registry --- ports/stronk/vcpkg.json | 1 - versions/s-/stronk.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/stronk/vcpkg.json b/ports/stronk/vcpkg.json index 56ca03885f5b6d..b8f102b6dffe63 100644 --- a/ports/stronk/vcpkg.json +++ b/ports/stronk/vcpkg.json @@ -4,7 +4,6 @@ "description": "An easy to customize, strong type library with built in support for unit-like behavior", "homepage": "https://github.com/twig-energy/stronk", "license": "MIT", - "builtin-baseline": "acc3bcf76b84ae5041c86ab55fe138ae7b8255c7", "dependencies": [ { "name": "boost-type-index", diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json index 4b47aacba24b53..b77b9e97fe6007 100644 --- a/versions/s-/stronk.json +++ b/versions/s-/stronk.json @@ -2,7 +2,7 @@ "versions": [ { "version-semver": "0.2.0", - "git-tree": "87898e43d9de37fe271979e5ce4ba23e15c56e81" + "git-tree": "05abc4825bdb2f676c1b3a9918b590957ef894fe" } ] } From aa3c408307b6804bd2e888997ef1b587acf09cee Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 14 Sep 2022 14:20:13 +0800 Subject: [PATCH 04/10] fix include wrong directroy --- ports/stronk/fix-wrong-include.patch | 11 +++++++++++ ports/stronk/portfile.cmake | 23 +++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 ports/stronk/fix-wrong-include.patch diff --git a/ports/stronk/fix-wrong-include.patch b/ports/stronk/fix-wrong-include.patch new file mode 100644 index 00000000000000..625c050228945d --- /dev/null +++ b/ports/stronk/fix-wrong-include.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/install-rules.cmake b/cmake/install-rules.cmake +index 0282aaf..1be8437 100644 +--- a/cmake/install-rules.cmake ++++ b/cmake/install-rules.cmake +@@ -1,5 +1,5 @@ + if(PROJECT_IS_TOP_LEVEL) +- set(CMAKE_INSTALL_INCLUDEDIR include/stronk CACHE PATH "") ++ set(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "") + endif() + + # Project is configured with no languages, so tell GNUInstallDirs the lib dir diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake index 073ba4e240285a..915424dcbefb07 100644 --- a/ports/stronk/portfile.cmake +++ b/ports/stronk/portfile.cmake @@ -1,21 +1,20 @@ vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL https://github.com/twig-energy/stronk - REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 - HEAD_REF main + OUT_SOURCE_PATH SOURCE_PATH + URL https://github.com/twig-energy/stronk + REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 + HEAD_REF main + PATCHES + fix-wrong-include.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH} ) vcpkg_cmake_install() -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug" -) +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file( - INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From d5bd92fade6ce977f192bf1ac1ed03216aa90abf Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Wed, 14 Sep 2022 14:22:29 +0800 Subject: [PATCH 05/10] update version --- versions/s-/stronk.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json index b77b9e97fe6007..fa5e5d237ba769 100644 --- a/versions/s-/stronk.json +++ b/versions/s-/stronk.json @@ -1,8 +1,9 @@ { - "versions": [ - { - "version-semver": "0.2.0", - "git-tree": "05abc4825bdb2f676c1b3a9918b590957ef894fe" - } - ] + "versions": [ + { + "git-tree": "b48ebf5e9c58bf7dc43b766bd7d96bf3ee757df5", + "version-semver": "0.2.0", + "port-version": 0 + } + ] } From 31b43168d6ea4e2ef21286f2f6890a7a2e3662eb Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 15 Sep 2022 18:30:45 +0800 Subject: [PATCH 06/10] delete patch --- ports/stronk/fix-wrong-include.patch | 11 ----------- ports/stronk/portfile.cmake | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 ports/stronk/fix-wrong-include.patch diff --git a/ports/stronk/fix-wrong-include.patch b/ports/stronk/fix-wrong-include.patch deleted file mode 100644 index 625c050228945d..00000000000000 --- a/ports/stronk/fix-wrong-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/cmake/install-rules.cmake b/cmake/install-rules.cmake -index 0282aaf..1be8437 100644 ---- a/cmake/install-rules.cmake -+++ b/cmake/install-rules.cmake -@@ -1,5 +1,5 @@ - if(PROJECT_IS_TOP_LEVEL) -- set(CMAKE_INSTALL_INCLUDEDIR include/stronk CACHE PATH "") -+ set(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "") - endif() - - # Project is configured with no languages, so tell GNUInstallDirs the lib dir diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake index 915424dcbefb07..56810c05344c71 100644 --- a/ports/stronk/portfile.cmake +++ b/ports/stronk/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_from_git( URL https://github.com/twig-energy/stronk REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 HEAD_REF main - PATCHES - fix-wrong-include.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include" ) vcpkg_cmake_install() From 9689fbe07fe3ba14ae0332e7fb84bfa2cddf7353 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 15 Sep 2022 18:31:24 +0800 Subject: [PATCH 07/10] update version --- versions/s-/stronk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json index fa5e5d237ba769..03453ae4c4ee8b 100644 --- a/versions/s-/stronk.json +++ b/versions/s-/stronk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b48ebf5e9c58bf7dc43b766bd7d96bf3ee757df5", + "git-tree": "93bbc4ca6e58d16003556544705f2b71f0290517", "version-semver": "0.2.0", "port-version": 0 } From 278141d7c7e085effe5dc404663b331b61505e87 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 15 Sep 2022 18:40:38 +0800 Subject: [PATCH 08/10] Add quotes --- ports/stronk/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake index 56810c05344c71..52c55aaa9652b3 100644 --- a/ports/stronk/portfile.cmake +++ b/ports/stronk/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_git( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_INSTALL_INCLUDEDIR="${CURRENT_PACKAGES_DIR}/include" + "-DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include" ) vcpkg_cmake_install() From b1dae2ce7fcbc6c39cdef13d756698e0a5da0c80 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 15 Sep 2022 18:41:00 +0800 Subject: [PATCH 09/10] update version --- versions/s-/stronk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json index 03453ae4c4ee8b..ea6b8bf3f4f67c 100644 --- a/versions/s-/stronk.json +++ b/versions/s-/stronk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "93bbc4ca6e58d16003556544705f2b71f0290517", + "git-tree": "8989e4036d6c7fed6451540b385cc7b3a8537705", "version-semver": "0.2.0", "port-version": 0 } From 0e5279831543fb82ebf33b0b9a0c0574bb5ab649 Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Mon, 19 Sep 2022 23:24:25 +0200 Subject: [PATCH 10/10] Use vcpkg_from_github --- ports/stronk/portfile.cmake | 17 +++++++++-------- versions/s-/stronk.json | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake index 52c55aaa9652b3..6bc759eb47e0f5 100644 --- a/ports/stronk/portfile.cmake +++ b/ports/stronk/portfile.cmake @@ -1,14 +1,15 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL https://github.com/twig-energy/stronk - REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 - HEAD_REF main +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO twig-energy/stronk + REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 + HEAD_REF main + SHA512 889c7a58082ab506f0c3b8b11e2f7d70f0b9a9ed67322310b43f070b79b71c3c115d1942319e7b461da80a0708c750503705d437d8228c54d7fa8f6e4626ad43 ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include" + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include" ) vcpkg_cmake_install() diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json index ea6b8bf3f4f67c..c2b72f7a70d597 100644 --- a/versions/s-/stronk.json +++ b/versions/s-/stronk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8989e4036d6c7fed6451540b385cc7b3a8537705", + "git-tree": "e4a44d9b4174532927a658b7762122b06ad2f663", "version-semver": "0.2.0", "port-version": 0 }