From d86a892e01d078681fbab4cd67b858576ac38f23 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 12 Aug 2021 18:34:58 +0900 Subject: [PATCH 01/10] update immer port --- ports/immer/CONTROL | 3 --- ports/immer/portfile.cmake | 20 ++++++++++++++------ ports/immer/vcpkg.json | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 9 deletions(-) delete mode 100644 ports/immer/CONTROL create mode 100644 ports/immer/vcpkg.json diff --git a/ports/immer/CONTROL b/ports/immer/CONTROL deleted file mode 100644 index f6f736b59a655f..00000000000000 --- a/ports/immer/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: immer -Version: 2019-06-07 -Description: Postmodern immutable and persistent data structures for C++ diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index 10c1e607337def..9eab269748ec98 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -3,11 +3,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/immer - REF fe1d5151f8e62a97a953664f8de39b05ac0d2031 - SHA512 2f78c2d85a24b2bcb69bbbf8b038c8bacb5a841e0f0ce7e4e521d369423c7d44f803a1c766a77d0955246a1b22476de15fa708a3786f05c41a3b705a574bbb71 + REF a11df7243cb516a1aeffc83c31366d7259c79e82 + SHA512 7aefa894d57167e8606ffd20c78490731885da610da084ffdc4ee677e40c7a3b4edcd0fbf74e354fc68866d09ec7a35a7c549f78ce91f2f1a84bb6ccc605e135 HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "docs" immer_BUILD_DOCS +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -15,13 +20,16 @@ vcpkg_configure_cmake( -DENABLE_PYTHON=OFF -DENABLE_GUILE=OFF -DENABLE_BOOST_COROUTINE=OFF + -Dimmer_BUILD_TESTS=OFF + -Dimmer_BUILD_EXAMPLES=OFF + -Dimmer_BUILD_EXTRAS=OFF + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Immer) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Immer) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json new file mode 100644 index 00000000000000..a1cf40d6d2eea2 --- /dev/null +++ b/ports/immer/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "immer", + "version-string": "2021-05-03", + "port-version": 2, + "description": "Postmodern immutable and persistent data structures for C++", + "homepage": "https://sinusoid.es/immer/", + "dependencies": [ + "vcpkg-cmake-config" + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} From 0e0fd03cde52b94cd47ebe0e220e244b17667387 Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 12 Aug 2021 19:19:56 +0900 Subject: [PATCH 02/10] run `vcpkg x-add-version --all` --- versions/baseline.json | 4 ++-- versions/i-/immer.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b52840b021d60a..19d4484d86ddad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2693,8 +2693,8 @@ "port-version": 0 }, "immer": { - "baseline": "2019-06-07", - "port-version": 0 + "baseline": "2021-05-03", + "port-version": 2 }, "implot": { "baseline": "0.11", diff --git a/versions/i-/immer.json b/versions/i-/immer.json index 5aa14d0562878b..68850cd5366b3b 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "109831691a62c81c985e8652aa7e1f073d776660", + "version-string": "2021-05-03", + "port-version": 2 + }, { "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669", "version-string": "2019-06-07", From b90639ad41f68d988151cea6eafb05d618aeca5b Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:02:49 +0900 Subject: [PATCH 03/10] Update ports/immer/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/immer/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index 9eab269748ec98..6c4c4ece1b1bab 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Immer) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") From 18c4f74a9c465ed156de54d50d6c16f10524de05 Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:02:53 +0900 Subject: [PATCH 04/10] Update ports/immer/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/immer/portfile.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index 6c4c4ece1b1bab..4beb85080f3fc4 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -13,9 +13,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "docs" immer_BUILD_DOCS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_PYTHON=OFF -DENABLE_GUILE=OFF From cf73d67be719fd5faacfc510a7124f4d21213fd2 Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:03:18 +0900 Subject: [PATCH 05/10] Update ports/immer/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/immer/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index 4beb85080f3fc4..c6c2a0bb0c93bb 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -31,4 +31,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Immer) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -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 ddaca9984dd2c7e9b52b91a9dac2d7991c34b3c8 Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:03:23 +0900 Subject: [PATCH 06/10] Update ports/immer/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/immer/vcpkg.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json index a1cf40d6d2eea2..2fe8fddd9e2f50 100644 --- a/ports/immer/vcpkg.json +++ b/ports/immer/vcpkg.json @@ -5,7 +5,14 @@ "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "dependencies": [ - "vcpkg-cmake-config" + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "docs": { From ad75a736cf7a0e102847c319715500d50f112f5d Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:03:42 +0900 Subject: [PATCH 07/10] Update ports/immer/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/immer/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json index 2fe8fddd9e2f50..96fdf7f3c18f30 100644 --- a/ports/immer/vcpkg.json +++ b/ports/immer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "immer", "version-string": "2021-05-03", - "port-version": 2, "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "dependencies": [ From 4ff91be289d46d57571807c81ecb4a1db7a6e50e Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 13 Aug 2021 15:03:52 +0900 Subject: [PATCH 08/10] Update ports/immer/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/immer/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json index 96fdf7f3c18f30..c52c0f02cf550e 100644 --- a/ports/immer/vcpkg.json +++ b/ports/immer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "immer", - "version-string": "2021-05-03", + "version-date": "2021-05-03", "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "dependencies": [ From 6f92b35c1e3e43f4c8ed101291ff25e8f042da06 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 13 Aug 2021 16:11:57 +0800 Subject: [PATCH 09/10] update verison --- versions/baseline.json | 2 +- versions/i-/immer.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 19d4484d86ddad..80f3894747e1e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2694,7 +2694,7 @@ }, "immer": { "baseline": "2021-05-03", - "port-version": 2 + "port-version": 0 }, "implot": { "baseline": "0.11", diff --git a/versions/i-/immer.json b/versions/i-/immer.json index 68850cd5366b3b..f22fb874760815 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ee78459721140ead0ace0a031bbb9d28039b19e", + "version-date": "2021-05-03", + "port-version": 0 + }, { "git-tree": "109831691a62c81c985e8652aa7e1f073d776660", "version-string": "2021-05-03", From 2659ba8ef0828cd731660d4b53a6395d77e94c20 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 13 Aug 2021 16:13:48 +0800 Subject: [PATCH 10/10] delete versions --- versions/i-/immer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/i-/immer.json b/versions/i-/immer.json index f22fb874760815..0ab115f21b67a5 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -5,11 +5,6 @@ "version-date": "2021-05-03", "port-version": 0 }, - { - "git-tree": "109831691a62c81c985e8652aa7e1f073d776660", - "version-string": "2021-05-03", - "port-version": 2 - }, { "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669", "version-string": "2019-06-07",