From 6ade90547c86e15df209de6ee5ba0710cd8f5cc6 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 12 Aug 2021 18:23:55 +0900 Subject: [PATCH 1/7] add zug port --- ports/zug/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/zug/vcpkg.json | 10 ++++++++++ 2 files changed, 38 insertions(+) create mode 100644 ports/zug/portfile.cmake create mode 100644 ports/zug/vcpkg.json diff --git a/ports/zug/portfile.cmake b/ports/zug/portfile.cmake new file mode 100644 index 00000000000000..0538e5f39e0806 --- /dev/null +++ b/ports/zug/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arximboldi/zug + REF 033dadbed463ff3430b7ebc36df8a46f4f0f5078 + SHA512 a8067a90f7a427775872f8198419aa791b647e273ed148b93c189d3b81a4564a19b9321b4bb8cd5681627d8ab13e40be09ed1d75c7b65d74078f21daddaef929 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + docs zug_BUILD_DOCS +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dzug_BUILD_EXAMPLES=OFF + -Dzug_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) + + +vcpkg_install_cmake() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Zug) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/zug/vcpkg.json b/ports/zug/vcpkg.json new file mode 100644 index 00000000000000..f8cd9f6a8524b7 --- /dev/null +++ b/ports/zug/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "zug", + "version-string": "2021-04-23", + "port-version": 1, + "description": "Transducers for C++", + "homepage": "https://sinusoid.es/zug/", + "dependencies": [ + "vcpkg-cmake-config" + ] +} From 8ffd4835cee3d0c602224855d8c3519ae856fd5d Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 12 Aug 2021 18:24:09 +0900 Subject: [PATCH 2/7] run `vcpkg x-add-version --all` --- versions/baseline.json | 4 ++++ versions/z-/zug.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/z-/zug.json diff --git a/versions/baseline.json b/versions/baseline.json index b52840b021d60a..3f61174d06f0e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6964,6 +6964,10 @@ "baseline": "1.0.4", "port-version": 0 }, + "zug": { + "baseline": "2021-04-23", + "port-version": 1 + }, "zxing-cpp": { "baseline": "2020-12-2", "port-version": 0 diff --git a/versions/z-/zug.json b/versions/z-/zug.json new file mode 100644 index 00000000000000..3fa395ba0a4a6e --- /dev/null +++ b/versions/z-/zug.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "31594b669d9220f4b77ce5cd1826e0e7f9c884f3", + "version-string": "2021-04-23", + "port-version": 1 + } + ] +} From 1f72d35997937e42071b76b32bd01d6f641ccefa Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 12 Aug 2021 18:46:06 +0900 Subject: [PATCH 3/7] add missing docs feature to zug --- ports/zug/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/zug/vcpkg.json b/ports/zug/vcpkg.json index f8cd9f6a8524b7..b856b7cdf9bcea 100644 --- a/ports/zug/vcpkg.json +++ b/ports/zug/vcpkg.json @@ -6,5 +6,10 @@ "homepage": "https://sinusoid.es/zug/", "dependencies": [ "vcpkg-cmake-config" - ] + ], + "features": { + "docs": { + "description": "Build documentation" + } + } } From ed1e88c3bec09a52b1562578f5eee33114fe326c Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 12 Aug 2021 18:46:46 +0900 Subject: [PATCH 4/7] run `vcpkg x-add-version --all --overwrite-version` --- versions/z-/zug.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/z-/zug.json b/versions/z-/zug.json index 3fa395ba0a4a6e..502b91683ac3a9 100644 --- a/versions/z-/zug.json +++ b/versions/z-/zug.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "31594b669d9220f4b77ce5cd1826e0e7f9c884f3", + "git-tree": "b9831e86effb48b9a427f2a67530f5ead78657b6", "version-string": "2021-04-23", "port-version": 1 } From 6a2248897a41925795b359de9753296a2210c259 Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:06:01 +0900 Subject: [PATCH 5/7] Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/zug/portfile.cmake | 9 ++++----- ports/zug/vcpkg.json | 12 +++++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/zug/portfile.cmake b/ports/zug/portfile.cmake index 0538e5f39e0806..d222436fe24f8e 100644 --- a/ports/zug/portfile.cmake +++ b/ports/zug/portfile.cmake @@ -11,9 +11,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS docs zug_BUILD_DOCS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dzug_BUILD_EXAMPLES=OFF -Dzug_BUILD_TESTS=OFF @@ -21,8 +20,8 @@ vcpkg_configure_cmake( ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Zug) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -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) diff --git a/ports/zug/vcpkg.json b/ports/zug/vcpkg.json index b856b7cdf9bcea..33c878b7d34128 100644 --- a/ports/zug/vcpkg.json +++ b/ports/zug/vcpkg.json @@ -1,11 +1,17 @@ { "name": "zug", - "version-string": "2021-04-23", - "port-version": 1, + "version-date": "2021-04-23", "description": "Transducers for C++", "homepage": "https://sinusoid.es/zug/", "dependencies": [ - "vcpkg-cmake-config" + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "docs": { From 395ec57290fa442c47138568f312b72926ffbae2 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 13 Aug 2021 14:46:11 +0800 Subject: [PATCH 6/7] format vcpkg.json --- ports/zug/vcpkg.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/zug/vcpkg.json b/ports/zug/vcpkg.json index 33c878b7d34128..ac59f865eb87f5 100644 --- a/ports/zug/vcpkg.json +++ b/ports/zug/vcpkg.json @@ -4,14 +4,14 @@ "description": "Transducers for C++", "homepage": "https://sinusoid.es/zug/", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "docs": { From 4b5f6a866480d9e8ddca567de0aaa93bd30ecca6 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 13 Aug 2021 14:48:14 +0800 Subject: [PATCH 7/7] update version --- versions/baseline.json | 2 +- versions/z-/zug.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3f61174d06f0e1..6da8a578c0cfe5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6966,7 +6966,7 @@ }, "zug": { "baseline": "2021-04-23", - "port-version": 1 + "port-version": 0 }, "zxing-cpp": { "baseline": "2020-12-2", diff --git a/versions/z-/zug.json b/versions/z-/zug.json index 502b91683ac3a9..687ab2d8f77370 100644 --- a/versions/z-/zug.json +++ b/versions/z-/zug.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "b9831e86effb48b9a427f2a67530f5ead78657b6", - "version-string": "2021-04-23", - "port-version": 1 + "git-tree": "2213b3d809f8a99994484b626896f6cf6e3858c3", + "version-date": "2021-04-23", + "port-version": 0 } ] }