From 1e35bd2292048c91fae64e7352cbdc643bd503e7 Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 3 Mar 2022 16:02:14 -0500 Subject: [PATCH 1/7] [parallel-hashmap] update version to 1.34 --- ports/parallel-hashmap/portfile.cmake | 4 ++-- ports/parallel-hashmap/vcpkg.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index e8b81b15d18176..19e6a33366d1a1 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.33 - SHA512 287f098229153d925632e68e3cdbabfae0ea0ab8864089e4c0553a166c6079ca82ed5246ba53afd2a2917abcf06f37bc18f098e721f5f3b8def4d2d8c1c8c745 + REF 1.34 + SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429 HEAD_REF master ) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index b1d7230cf1d651..5917731b14bb9c 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parallel-hashmap", - "version-string": "1.33", + "version-string": "1.34", "port-version": 1, - "description": "A header-only, very fast and memory-friendly family of C++ hash maps." + "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers." } From 3ff9daee603c04c75afabf58f67f4930fb0ebe92 Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 3 Mar 2022 20:27:31 -0500 Subject: [PATCH 2/7] run `vcpkg x-add-version --all` and change `version-string` to `version` --- ports/parallel-hashmap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/parallel-hashmap.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index 5917731b14bb9c..a1e0947411a0d3 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parallel-hashmap", - "version-string": "1.34", + "version": "1.34", "port-version": 1, "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers." } diff --git a/versions/baseline.json b/versions/baseline.json index 0db4dbac01ee44..055571fbf2de02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5221,7 +5221,7 @@ "port-version": 1 }, "parallel-hashmap": { - "baseline": "1.33", + "baseline": "1.34", "port-version": 1 }, "parallelstl": { diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index eb98c22e2cadb4..39c50ca3dab83b 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91ec64439617b40db9462e9f27e35f2592b24ff1", + "version": "1.34", + "port-version": 1 + }, { "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", "version-string": "1.33", From 7e9bb09e747d48f5fd4d84b1238a67b3b6fc53f7 Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 3 Mar 2022 20:40:36 -0500 Subject: [PATCH 3/7] make suggested changes --- ports/parallel-hashmap/portfile.cmake | 4 ++-- ports/parallel-hashmap/vcpkg.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 19e6a33366d1a1..fcb219e257250c 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -9,11 +9,11 @@ vcpkg_from_github( ) # Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Delete redundant directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index a1e0947411a0d3..0c0119426f64a8 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -2,5 +2,6 @@ "name": "parallel-hashmap", "version": "1.34", "port-version": 1, + "license": "Apache-2.0", "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers." } From db7b4b30cc2bc350b514e28e33ef7195b815921c Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 3 Mar 2022 21:05:45 -0500 Subject: [PATCH 4/7] add changes suggested by @JonLui1993 --- ports/parallel-hashmap/portfile.cmake | 3 +-- ports/parallel-hashmap/vcpkg.json | 9 +++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index fcb219e257250c..044226d8bf2f6c 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -10,8 +10,7 @@ vcpkg_from_github( # Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index 0c0119426f64a8..b0a8ce9f8b4604 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,7 +1,12 @@ { "name": "parallel-hashmap", "version": "1.34", - "port-version": 1, "license": "Apache-2.0", - "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers." + "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", + "dependencies":[ + { + "name": "vcpkg-cmake", + "host": true + } + ] } From d11feb7df1e520d251f1bb4b26389856edb51338 Mon Sep 17 00:00:00 2001 From: greg Date: Thu, 3 Mar 2022 21:17:44 -0500 Subject: [PATCH 5/7] ran `vcpkg x-add-version --all ` as suggested --- ports/parallel-hashmap/vcpkg.json | 12 ++++++------ versions/baseline.json | 2 +- versions/p-/parallel-hashmap.json | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index b0a8ce9f8b4604..8393345a885e6b 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,12 +1,12 @@ { "name": "parallel-hashmap", "version": "1.34", - "license": "Apache-2.0", "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", - "dependencies":[ - { - "name": "vcpkg-cmake", - "host": true - } + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 055571fbf2de02..c00be480d90193 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5222,7 +5222,7 @@ }, "parallel-hashmap": { "baseline": "1.34", - "port-version": 1 + "port-version": 0 }, "parallelstl": { "baseline": "20200330", diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index 39c50ca3dab83b..dc9697956f745e 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "289d9abe2103175720e5b75c1b5ac510312a2baa", + "version": "1.34", + "port-version": 0 + }, { "git-tree": "91ec64439617b40db9462e9f27e35f2592b24ff1", "version": "1.34", From a8dad8fae84a8f5735c4d6429438c222cc63b5e3 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 4 Mar 2022 10:33:02 +0800 Subject: [PATCH 6/7] update version --- versions/p-/parallel-hashmap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index dc9697956f745e..3ca691ddddd2b4 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "289d9abe2103175720e5b75c1b5ac510312a2baa", + "git-tree": "f72efb2dae42b2f746be8e239b00b707b3a61449", "version": "1.34", "port-version": 0 }, From fd6f30f21222dc13bb6993064140fdf9920dd261 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 4 Mar 2022 10:38:04 +0800 Subject: [PATCH 7/7] update parallel-hashmap.json --- versions/p-/parallel-hashmap.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index 3ca691ddddd2b4..eadbb281397c44 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -5,11 +5,6 @@ "version": "1.34", "port-version": 0 }, - { - "git-tree": "91ec64439617b40db9462e9f27e35f2592b24ff1", - "version": "1.34", - "port-version": 1 - }, { "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", "version-string": "1.33",