From ff7ca73e121d7451142275c560c7d89a4e57b9f9 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sun, 28 Jun 2020 08:54:41 +0800 Subject: [PATCH 01/12] [simdjson] Update to 0.4.1 --- ports/simdjson/CONTROL | 2 +- ports/simdjson/no_benchmark.patch | 12 ------------ ports/simdjson/portfile.cmake | 10 ++++------ 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 ports/simdjson/no_benchmark.patch diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index 585ba0fa82b3ef..5340dc6dd12223 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,5 +1,5 @@ Source: simdjson -Version: 2020-05-26 +Version: 0.4.1 Description: A extremely fast JSON library that can parse gigabytes of JSON per second Homepage: https://github.com/lemire/simdjson Supports: !x86 diff --git a/ports/simdjson/no_benchmark.patch b/ports/simdjson/no_benchmark.patch deleted file mode 100644 index 7ec15869e4b938..00000000000000 --- a/ports/simdjson/no_benchmark.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42640bc..7a621a8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,6 @@ add_subdirectory(singleheader) - add_subdirectory(dependencies) - add_subdirectory(tests) - add_subdirectory(examples) --add_subdirectory(benchmark) - add_subdirectory(fuzz) - - # diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index be6f80a0a6448f..71b87626f9ec31 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -3,12 +3,9 @@ vcpkg_fail_port_install(ON_ARCH "x86") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO lemire/simdjson - REF ac0c3093f4935fd266656abc9311a63fad98e99e - SHA512 69bc9ce45839d5e42aefcf5a96f82f3049b05591f4d463b788365123ba06c36f0f784ede02e5015bd96bf8d0e631ccaac285ed5a63048113f2ea01d91d51b395 - HEAD_REF master - PATCHES - no_benchmark.patch # `_pclose` is not available on UWP + REPO simdjson/simdjson + REF 6b85b9a416ca464289bb5673ce277b5bbf3f912a # v0.4.1 + SHA512 d17c3d8020f80c2f26853cd308c9621cd9db8c503616a8f10b20bcf54db9f6d810f1a9a6e73122a78d2fbcfe8f09227205560640f4fcff610a6c1b4440fb5e26 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) @@ -20,6 +17,7 @@ vcpkg_configure_cmake( OPTIONS -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} + -DSIMDJSON_JUST_LIBRARY=ON -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495 From b065c0cb61729165b6ab5d3d0bcdaa97fa2b22ce Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 29 Jun 2020 08:56:59 +0800 Subject: [PATCH 02/12] [simdjson] Update to v0.4.2 --- ports/simdjson/CONTROL | 2 +- ports/simdjson/portfile.cmake | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index 5340dc6dd12223..f749ce583aceaa 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,5 +1,5 @@ Source: simdjson -Version: 0.4.1 +Version: 0.4.2 Description: A extremely fast JSON library that can parse gigabytes of JSON per second Homepage: https://github.com/lemire/simdjson Supports: !x86 diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 71b87626f9ec31..b45a9cf094fa2d 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -4,8 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "x86") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 6b85b9a416ca464289bb5673ce277b5bbf3f912a # v0.4.1 - SHA512 d17c3d8020f80c2f26853cd308c9621cd9db8c503616a8f10b20bcf54db9f6d810f1a9a6e73122a78d2fbcfe8f09227205560640f4fcff610a6c1b4440fb5e26 + REF 8b661fe55687b59c4fffac871036a8b109067df0 # v0.4.2 + SHA512 e05dd7f105a81c4686955b0bfbf8e4716a30fded63645ef101e62dc9dd57e38c23770061121ebc4bf0009de1aed852a4354788c44c6331de8c35b44587f8223d + HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) From 2e58d5a526c806b95095ecd17303d063efe0f7eb Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 29 Jun 2020 09:08:57 +0800 Subject: [PATCH 03/12] [simdjson] arm-uwp is supported now --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e1cf3fa9f1c969..1e2d9572913939 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1683,7 +1683,6 @@ shogun:x64-windows-static = skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail -simdjson:arm-uwp=fail simdjson:x86-windows=fail skia:arm64-windows=fail skia:arm-uwp=fail From fc7808fb2f2b9be94a66cfc0e837b4d9495c2eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 29 Jun 2020 11:10:54 +0800 Subject: [PATCH 04/12] Update scripts/ci.baseline.txt --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1e2d9572913939..8912c2b4cc172e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1683,7 +1683,6 @@ shogun:x64-windows-static = skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail -simdjson:x86-windows=fail skia:arm64-windows=fail skia:arm-uwp=fail skia:x64-linux=fail From 80d9abcdc2067c3fa843d575de2f6b0652de2b15 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Mon, 29 Jun 2020 14:00:56 +0800 Subject: [PATCH 05/12] [simdjson] x86 is also supported now(though not recommended) --- ports/simdjson/CONTROL | 3 +-- ports/simdjson/portfile.cmake | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index f749ce583aceaa..f822fb6f5d0a64 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,5 +1,4 @@ Source: simdjson Version: 0.4.2 Description: A extremely fast JSON library that can parse gigabytes of JSON per second -Homepage: https://github.com/lemire/simdjson -Supports: !x86 +Homepage: https://simdjson.org/ diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index b45a9cf094fa2d..1f09b63961eab9 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,6 +1,3 @@ -# https://github.com/Microsoft/vcpkg/issues/5418#issuecomment-470519894 -vcpkg_fail_port_install(ON_ARCH "x86") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson From aaef1b835bb937ce289177dee869543253e6359a Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 30 Jun 2020 17:11:02 +0800 Subject: [PATCH 06/12] [simdjson] Update to 0.4.3 (it will fail) --- ports/simdjson/CONTROL | 2 +- ports/simdjson/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index f822fb6f5d0a64..e9daf82e1ec49c 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,4 +1,4 @@ Source: simdjson -Version: 0.4.2 +Version: 0.4.3 Description: A extremely fast JSON library that can parse gigabytes of JSON per second Homepage: https://simdjson.org/ diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 1f09b63961eab9..4c1afe6b5818fc 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 8b661fe55687b59c4fffac871036a8b109067df0 # v0.4.2 - SHA512 e05dd7f105a81c4686955b0bfbf8e4716a30fded63645ef101e62dc9dd57e38c23770061121ebc4bf0009de1aed852a4354788c44c6331de8c35b44587f8223d + REF 3faae676632e73aeaca9c0dcacac16988553d7ac # v0.4.3 + SHA512 c4a8c4caa1051941107905964a97eeeebf538a0df5670d033a90f3e9b400e13379a17a91af3c4d5a00eb366f698be4908e12803b688760fed488c37a738956e9 HEAD_REF master ) From 0304f596710f247968aedb45648904061d49db7a Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 30 Jun 2020 18:21:19 +0800 Subject: [PATCH 07/12] [simdjson] Disable Ninja temporarily --- ports/simdjson/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 4c1afe6b5818fc..ad87f4392d3427 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -11,7 +11,9 @@ string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTAT vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + # TODO: + # Uncomment this line once https://github.com/simdjson/simdjson/pull/1009 is processed. + #PREFER_NINJA OPTIONS -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} From c1b4e3f17538ba6de449244cc46a4f490ae77c40 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 30 Jun 2020 23:37:10 +0800 Subject: [PATCH 08/12] [simdjson] Update to 0.4.4 --- ports/simdjson/CONTROL | 2 +- ports/simdjson/portfile.cmake | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index e9daf82e1ec49c..f13090674d61ec 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,4 +1,4 @@ Source: simdjson -Version: 0.4.3 +Version: 0.4.4 Description: A extremely fast JSON library that can parse gigabytes of JSON per second Homepage: https://simdjson.org/ diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index ad87f4392d3427..557709d8c51aa3 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 3faae676632e73aeaca9c0dcacac16988553d7ac # v0.4.3 - SHA512 c4a8c4caa1051941107905964a97eeeebf538a0df5670d033a90f3e9b400e13379a17a91af3c4d5a00eb366f698be4908e12803b688760fed488c37a738956e9 + REF e38fe3d361f34a918bc5e0a063073e44bc96115e # v0.4.4 + SHA512 3e5a325f5a0f0f60c2382e45f65f97cea4c92c6f0382d49941a70023f374f5e754573e1d8396fd1fd2842917cd9204763a594e52d66252eb1fc4af7768e56398 HEAD_REF master ) @@ -11,9 +11,7 @@ string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTAT vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - # TODO: - # Uncomment this line once https://github.com/simdjson/simdjson/pull/1009 is processed. - #PREFER_NINJA + PREFER_NINJA OPTIONS -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} From de8778bfcdaa9e6d28548b0d227b4ace18740521 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 1 Jul 2020 08:26:48 +0800 Subject: [PATCH 09/12] [simdjson] Update to 0.4.5 --- ports/simdjson/CONTROL | 2 +- ports/simdjson/portfile.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index f13090674d61ec..6212bc7fe31a50 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,4 +1,4 @@ Source: simdjson -Version: 0.4.4 +Version: 0.4.5 Description: A extremely fast JSON library that can parse gigabytes of JSON per second Homepage: https://simdjson.org/ diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 557709d8c51aa3..426e809df5573c 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF e38fe3d361f34a918bc5e0a063073e44bc96115e # v0.4.4 - SHA512 3e5a325f5a0f0f60c2382e45f65f97cea4c92c6f0382d49941a70023f374f5e754573e1d8396fd1fd2842917cd9204763a594e52d66252eb1fc4af7768e56398 - HEAD_REF master + REF 0ef4d90ad07f2abc72b22600292c32d32cb1ff44 # v0.4.5 + SHA512 72363dfcc4a8731edc49518e0489db7810b3694345dc9819f3b3a02c23f6a61d5140295ae99d768308d9f588691ed71f3d1a469b47d5f0867e157c23202e826e ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) From c6d001fa28f4f80a1099d435baa6a96320cff95a Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 1 Jul 2020 08:59:47 +0800 Subject: [PATCH 10/12] [simdjson] Add manifest file --- ports/simdjson/CONTROL | 4 ---- ports/simdjson/vcpkg.json | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 ports/simdjson/CONTROL create mode 100644 ports/simdjson/vcpkg.json diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL deleted file mode 100644 index 6212bc7fe31a50..00000000000000 --- a/ports/simdjson/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: simdjson -Version: 0.4.5 -Description: A extremely fast JSON library that can parse gigabytes of JSON per second -Homepage: https://simdjson.org/ diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json new file mode 100644 index 00000000000000..c00c09a0a3201d --- /dev/null +++ b/ports/simdjson/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simdjson", + "version-string": "0.4.5", + "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", + "homepage": "https://simdjson.org/", + "license": "Apache-2.0" +} From d28e09c95a2428c75205fac240c274450fe01b6a Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 4 Jul 2020 11:58:36 +0800 Subject: [PATCH 11/12] [simdjson] Update to 0.4.6 --- ports/simdjson/portfile.cmake | 4 ++-- ports/simdjson/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 426e809df5573c..a0ee518c348990 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 0ef4d90ad07f2abc72b22600292c32d32cb1ff44 # v0.4.5 - SHA512 72363dfcc4a8731edc49518e0489db7810b3694345dc9819f3b3a02c23f6a61d5140295ae99d768308d9f588691ed71f3d1a469b47d5f0867e157c23202e826e + REF 74870a81898ba44407f5dce1f0f50d4ea53fca04 # v0.4.6 + SHA512 abd8621cb5ed2a9ccad54c2b9e09a2fc8c8fe5d6a70501d23b879f33e34a6c25d33901b385615e9bb29817c302977aa89bc0ab2a13365e413da557f1a099dd21 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index c00c09a0a3201d..618dcaf1230d62 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-string": "0.4.5", + "version-string": "0.4.6", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0" From 73a41027615d54d08ec741a812c4a8ae7930328a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sun, 5 Jul 2020 20:14:40 -0700 Subject: [PATCH 12/12] Update ports/simdjson/portfile.cmake --- ports/simdjson/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index a0ee518c348990..409182a72b54f8 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -2,6 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson REF 74870a81898ba44407f5dce1f0f50d4ea53fca04 # v0.4.6 + HEAD_REF master SHA512 abd8621cb5ed2a9ccad54c2b9e09a2fc8c8fe5d6a70501d23b879f33e34a6c25d33901b385615e9bb29817c302977aa89bc0ab2a13365e413da557f1a099dd21 )