From 69b469d13639cb5453cb54f92eae67decf27b0a9 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 9 Jun 2021 19:51:07 +0800 Subject: [PATCH 1/8] [simdjson] Update to 0.9.6 --- ports/simdjson/portfile.cmake | 21 +++++++++++++-------- ports/simdjson/vcpkg.json | 13 ++++++++++--- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index e3e701690e3db5..ac796c46bb67f5 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,23 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF c6c29c28278aeb29998e89f008908d951bb40c39 # v0.9.2 + REF e9b893ff1b13c6a70135827c62b3f3d65938d135 # v0.9.6 HEAD_REF master - SHA512 2c033e8fa253103f00606b7a14502d19c06385f22d1d09ea4b1edc6f443ba51ee95d49c790a05a64e28cd03f4350118b23c3c7f759a60e26a43da658609a5317 + SHA512 977b92ffae7219680f3d8567b1911b0d17ac1143a2ba58d7a4007cdcbf42dca6362853fcf3c3caf4af2029bc5f6a3cb8fab6139050a9d8539e8e4c7df646837d ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTATION_ARM64) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + no-deprecated SIMDJSON_DISABLE_DEPRECATED_API + threads SIMDJSON_ENABLE_THREADS +) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} - -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} - -DSIMDJSON_JUST_LIBRARY=ON + -DSIMDJSON_DEVELOPMENT_CHECKS=OFF + -DSIMDJSON_DEVELOPER_MODE=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_COMPETITION=OFF - -DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495 + -DSIMDJSON_ENABLE_FUZZING=OFF + -DSIMDJSON_CXXOPTS=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 0eb3ed90d7c1d1..104db45ff29b2c 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simdjson", - "version": "0.9.2", - "port-version": 1, + "version": "0.9.6", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", @@ -14,5 +13,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "no-deprecated": { + "description": "Disable deprecated APIs" + }, + "threads": { + "description": "Link with thread support" + } + } } From c2c81856fb9ba1a95a68cd858807df54e05bb891 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 7 Jul 2021 22:22:57 +0800 Subject: [PATCH 2/8] [simdjson] Update --- ports/simdjson/portfile.cmake | 16 ++++++++++------ ports/simdjson/vcpkg.json | 7 +++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index ac796c46bb67f5..d65cab6d6b9f11 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -9,19 +9,23 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + exceptions SIMDJSON_EXCEPTIONS no-deprecated SIMDJSON_DISABLE_DEPRECATED_API threads SIMDJSON_ENABLE_THREADS ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS + -DSIMDJSON_JUST_LIBRARY=ON + -DSIMDJSON_SANITIZE_UNDEFINED=OFF + -DSIMDJSON_SANITIZE=OFF + -DSIMDJSON_SANITIZE_THREADS=OFF + -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} -DSIMDJSON_DEVELOPMENT_CHECKS=OFF - -DSIMDJSON_DEVELOPER_MODE=OFF - -DSIMDJSON_GOOGLE_BENCHMARKS=OFF - -DSIMDJSON_COMPETITION=OFF - -DSIMDJSON_ENABLE_FUZZING=OFF - -DSIMDJSON_CXXOPTS=OFF + -DSIMDJSON_VERBOSE_LOGGING=OFF ${FEATURE_OPTIONS} ) @@ -40,4 +44,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 104db45ff29b2c..c33dffe7f90ec6 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -14,7 +14,14 @@ "host": true } ], + "default-features": [ + "exceptions", + "threads" + ], "features": { + "exceptions": { + "description": "Enable exception-throwing interface" + }, "no-deprecated": { "description": "Disable deprecated APIs" }, From c19772f671c481a3e3ad1bdc460a944260a3a28b Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 7 Jul 2021 22:30:15 +0800 Subject: [PATCH 3/8] [simdjson] Overwrite version --- versions/baseline.json | 4 ++-- versions/s-/simdjson.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a4360fc3e0a0a4..d67e4e1deccdc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5793,8 +5793,8 @@ "port-version": 0 }, "simdjson": { - "baseline": "0.9.2", - "port-version": 1 + "baseline": "0.9.6", + "port-version": 0 }, "simple-fft": { "baseline": "2020-06-14", diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 4de86b07f85344..e9a85836fb8756 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e198cdbf3c05ae876a65633c0faf5e0ecc2063ef", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "c9528b67438ec071c4108f925f3976b937f91469", "version": "0.9.2", From cbd043f2398bf4227dc48891b4b72ecf39ffad3e Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 17 Jul 2021 11:20:13 +0800 Subject: [PATCH 4/8] [simdjson] no-deprecated -> deprecated Features need to be additive, not subtractive. --- ports/simdjson/portfile.cmake | 7 ++++--- ports/simdjson/vcpkg.json | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index d65cab6d6b9f11..f38ee5f1012213 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -9,9 +9,10 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - exceptions SIMDJSON_EXCEPTIONS - no-deprecated SIMDJSON_DISABLE_DEPRECATED_API - threads SIMDJSON_ENABLE_THREADS + exceptions SIMDJSON_EXCEPTIONS + threads SIMDJSON_ENABLE_THREADS + INVERTED_FEATURES + deprecated SIMDJSON_DISABLE_DEPRECATED_API ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index c33dffe7f90ec6..7d426be87b45d7 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -19,12 +19,12 @@ "threads" ], "features": { + "deprecated": { + "description": "Enable deprecated APIs" + }, "exceptions": { "description": "Enable exception-throwing interface" }, - "no-deprecated": { - "description": "Disable deprecated APIs" - }, "threads": { "description": "Link with thread support" } From afd91f15285e6a27597d39c847a27f81eb913dc1 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 17 Jul 2021 11:29:47 +0800 Subject: [PATCH 5/8] [simdjson] Remove unnecessary code --- ports/simdjson/portfile.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index f38ee5f1012213..ffc1ba2fd528a2 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -36,13 +36,6 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/simdjson.h - "#if SIMDJSON_USING_LIBRARY" - "#if 1" - ) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file From 1f7f83b38d79681fbe84ba17a1fe493ac651c4b4 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 17 Jul 2021 11:30:25 +0800 Subject: [PATCH 6/8] [simdjson] Overwrite version --- versions/s-/simdjson.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index e9a85836fb8756..f1b3767c6209ed 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e198cdbf3c05ae876a65633c0faf5e0ecc2063ef", + "git-tree": "358ddfd5143fb8304496cd44e6be3481d59933f2", "version": "0.9.6", "port-version": 0 }, From dcc3410de897baf3b2e34a4e4cce2f95d78b1831 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 17 Jul 2021 11:42:20 +0800 Subject: [PATCH 7/8] [simdjson] Enable deprecated APIs by default --- ports/simdjson/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 7d426be87b45d7..13f89c1a7c590e 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -15,6 +15,7 @@ } ], "default-features": [ + "deprecated", "exceptions", "threads" ], From 828aeebcf7d89b55036bb0eb811d5df7d740f6f6 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 17 Jul 2021 11:42:44 +0800 Subject: [PATCH 8/8] [simdjson] Overwrite version --- versions/s-/simdjson.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index f1b3767c6209ed..8570d578b415bf 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "358ddfd5143fb8304496cd44e6be3481d59933f2", + "git-tree": "b913c5ecbf889a46c809032952c348605a78a391", "version": "0.9.6", "port-version": 0 },