From 99603955851b1c73f7ef82c49a45f3041fdb24ac Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Mon, 12 Dec 2022 13:23:34 -0800 Subject: [PATCH 1/9] Adding BlingFire Package --- ports/blingfire/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/blingfire/vcpkg.json | 12 ++++++++++++ scripts/ci.baseline.txt | 10 ++++++++++ versions/b-/blingfire.json | 9 +++++++++ versions/baseline.json | 4 ++++ 5 files changed, 64 insertions(+) create mode 100644 ports/blingfire/portfile.cmake create mode 100644 ports/blingfire/vcpkg.json create mode 100644 versions/b-/blingfire.json diff --git a/ports/blingfire/portfile.cmake b/ports/blingfire/portfile.cmake new file mode 100644 index 00000000000000..5535e36fbdba40 --- /dev/null +++ b/ports/blingfire/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/BlingFire + REF 7aad1df5f3625de70a760edcb8e54c5d2a65e8a8 + SHA512 c7f039728b72b33d2d66c75d7ca4baaa65fdf797cca99b43c0d9097531f7519302bc7597f5edcd9e1bde537d5f14c78c93a37eb3469f8da72e5bd5c634744301 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + WINDOWS_USE_MSBUILD + OPTIONS + ${ADDITIONAL_OPTIONS} + ) + +vcpkg_cmake_install() + +file(GLOB BINS "${SOURCE_PATH}/nuget/lib/*.bin") + +foreach(BIN ${BINS}) + file(INSTALL "${BIN}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +endforeach() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json new file mode 100644 index 00000000000000..30c765d91ab365 --- /dev/null +++ b/ports/blingfire/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "blingfire", + "version": "0.1.8.1", + "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index de2cc2b801deb1..2ebdac7a964a3a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -41,6 +41,16 @@ apr:arm64-windows=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:arm64-osx=fail +blingfire:x64-windows=pass +blingfire:arm64-windows=skip +blingfire:arm-uwp=skip +blingfire:x64-linux=skip +blingfire:x64-osx=skip +blingfire:arm64-osx=skip +blingfire:x64-uwp=skip +blingfire:x64-windows-static=skip +blingfire:x64-windows-static-md=skip +blingfire:x86-windows=skip blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json new file mode 100644 index 00000000000000..abf01931254d4e --- /dev/null +++ b/versions/b-/blingfire.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eaec4e8f6c06aab2b45efeb9390ad254d6bf26f6", + "version": "0.1.8.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f611fb0a96e972..06e3a3eb521dbb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -536,6 +536,10 @@ "baseline": "2022-05-02", "port-version": 0 }, + "blingfire": { + "baseline": "0.1.8.1", + "port-version": 0 + }, "blitz": { "baseline": "2020-03-25", "port-version": 5 From 1e6bb11e0642398d097d5f697a97ee76dcc21636 Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Mon, 12 Dec 2022 13:50:43 -0800 Subject: [PATCH 2/9] Adding updated baseline --- scripts/ci.baseline.txt | 4 ++-- versions/b-/blingfire.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2ebdac7a964a3a..5627afe2dece9b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -42,7 +42,8 @@ apr:arm64-windows=fail bde:x64-linux=fail bitserializer:arm64-osx=fail blingfire:x64-windows=pass -blingfire:arm64-windows=skip +blingfire:x86-windows=pass +blingfire:arm64-windows=pass blingfire:arm-uwp=skip blingfire:x64-linux=skip blingfire:x64-osx=skip @@ -50,7 +51,6 @@ blingfire:arm64-osx=skip blingfire:x64-uwp=skip blingfire:x64-windows-static=skip blingfire:x64-windows-static-md=skip -blingfire:x86-windows=skip blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json index abf01931254d4e..70321d0a18e20d 100644 --- a/versions/b-/blingfire.json +++ b/versions/b-/blingfire.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eaec4e8f6c06aab2b45efeb9390ad254d6bf26f6", + "git-tree": "116f5d9d79316a7186a821bfb0c02607cb4e4b8c", "version": "0.1.8.1", "port-version": 0 } From f2c1e1454544a1c2c0b9dfa4a9efc712877c7eec Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:10:58 -0800 Subject: [PATCH 3/9] Updating supported platforms --- ports/blingfire/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json index 30c765d91ab365..41341035262c1c 100644 --- a/ports/blingfire/vcpkg.json +++ b/ports/blingfire/vcpkg.json @@ -8,5 +8,6 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "supports": "windows && !static" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5627afe2dece9b..de2cc2b801deb1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -41,16 +41,6 @@ apr:arm64-windows=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:arm64-osx=fail -blingfire:x64-windows=pass -blingfire:x86-windows=pass -blingfire:arm64-windows=pass -blingfire:arm-uwp=skip -blingfire:x64-linux=skip -blingfire:x64-osx=skip -blingfire:arm64-osx=skip -blingfire:x64-uwp=skip -blingfire:x64-windows-static=skip -blingfire:x64-windows-static-md=skip blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail From b7e27e7e15fbf0b5db778016a8177be2914ea033 Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:12:36 -0800 Subject: [PATCH 4/9] Fixing up json --- ports/blingfire/vcpkg.json | 4 ++-- versions/b-/blingfire.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json index 41341035262c1c..42615512c1cfd9 100644 --- a/ports/blingfire/vcpkg.json +++ b/ports/blingfire/vcpkg.json @@ -3,11 +3,11 @@ "version": "0.1.8.1", "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.", "license": "MIT", + "supports": "windows & !static", "dependencies": [ { "name": "vcpkg-cmake", "host": true } - ], - "supports": "windows && !static" + ] } diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json index 70321d0a18e20d..faf7cab8469e9f 100644 --- a/versions/b-/blingfire.json +++ b/versions/b-/blingfire.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "116f5d9d79316a7186a821bfb0c02607cb4e4b8c", + "git-tree": "e941aceac0e243f40eb867818911437a7a86b583", "version": "0.1.8.1", "port-version": 0 } From 2352b9f1e4434f363d43651e076c1affd412ac1b Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:12:57 -0800 Subject: [PATCH 5/9] Updating version --- versions/b-/blingfire.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json index faf7cab8469e9f..0614dd0ed9a612 100644 --- a/versions/b-/blingfire.json +++ b/versions/b-/blingfire.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e941aceac0e243f40eb867818911437a7a86b583", + "git-tree": "dae8c5da042343d7e71eb36dc8d7e6491719ca9d", "version": "0.1.8.1", "port-version": 0 } From 6b656ff0f4ee1467f293141b1d1a959cf2f8dcb9 Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:28:18 -0800 Subject: [PATCH 6/9] Removing uwp platform --- ports/blingfire/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/blingfire/vcpkg.json b/ports/blingfire/vcpkg.json index 42615512c1cfd9..1a2b531a19b17d 100644 --- a/ports/blingfire/vcpkg.json +++ b/ports/blingfire/vcpkg.json @@ -3,7 +3,7 @@ "version": "0.1.8.1", "description": "BlingFire is a lightning fast Finite State machine and REgular expression manipulation library.", "license": "MIT", - "supports": "windows & !static", + "supports": "windows & !static & !uwp", "dependencies": [ { "name": "vcpkg-cmake", From f7e32263235630ac7175139ea7b7c0ee556914f3 Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:29:46 -0800 Subject: [PATCH 7/9] Updating version --- versions/b-/blingfire.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json index 0614dd0ed9a612..6cb02f9fdd0655 100644 --- a/versions/b-/blingfire.json +++ b/versions/b-/blingfire.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dae8c5da042343d7e71eb36dc8d7e6491719ca9d", + "git-tree": "b612164fcc876c20809bd10a2dfafa9c5830808f", "version": "0.1.8.1", "port-version": 0 } From 0be09400e82ac769903effcc86ebcf8b0006720d Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Mon, 19 Dec 2022 14:37:32 -0800 Subject: [PATCH 8/9] Updating to commit with cmake config --- ports/blingfire/portfile.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/blingfire/portfile.cmake b/ports/blingfire/portfile.cmake index 5535e36fbdba40..4a1bb8be8b9821 100644 --- a/ports/blingfire/portfile.cmake +++ b/ports/blingfire/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/BlingFire - REF 7aad1df5f3625de70a760edcb8e54c5d2a65e8a8 - SHA512 c7f039728b72b33d2d66c75d7ca4baaa65fdf797cca99b43c0d9097531f7519302bc7597f5edcd9e1bde537d5f14c78c93a37eb3469f8da72e5bd5c634744301 + REF 5089d31914cbed7a24589e753bd6cd362a377fbb + SHA512 428fbcd4fa695715c4ca299e314a85adb12bc41ab21eb373aa800d4ccb8755361b87b6c8d64e392922fd9cc334f5353fe638d2c3b1b61ab9d4cfdd94b6c36074 HEAD_REF master ) @@ -26,4 +26,5 @@ vcpkg_copy_pdbs() # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file From 8a3b403a7899c8cfb7e76e79678891c8dcc0efb5 Mon Sep 17 00:00:00 2001 From: Tomas Morris <23441012+TomasMorris@users.noreply.github.com> Date: Mon, 19 Dec 2022 14:39:12 -0800 Subject: [PATCH 9/9] Updating blingfire version --- versions/b-/blingfire.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/b-/blingfire.json b/versions/b-/blingfire.json index 6cb02f9fdd0655..bb12f4aa7c4ba9 100644 --- a/versions/b-/blingfire.json +++ b/versions/b-/blingfire.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b612164fcc876c20809bd10a2dfafa9c5830808f", + "git-tree": "a03c0185b4cb9b642aec1473ea6856a4fa321da9", "version": "0.1.8.1", "port-version": 0 }