Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rxspencer] Update to latest release 3.9.0 and also support dynamic build #19039

Merged
merged 3 commits into from
Jul 22, 2021
Merged

[rxspencer] Update to latest release 3.9.0 and also support dynamic build #19039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5647c7c
[rxspencer] Update to latest release 3.9.0
Jul 21, 2021
15d9b02
Update version files
Jul 21, 2021
65035b9
Remove fail from ci.baseline.txt
Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions ports/rxspencer/CONTROL
View file
Open in desktop

This file was deleted.

25 changes: 14 additions & 11 deletions ports/rxspencer/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,29 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO garyhouston/rxspencer
REF e42b6a667f1385aedf49b533b9fbba58e5a26934
SHA512 2842e1c78c3ebbbd03d15fb85e55f861740bb446aa57157f3fc90876d931d9f865242f5eaefc94f31c8d78e0d531a008d4c579e9b4f9c7179f5c7a95a98359fd
REF 9f835b523f1af617ca54e06863a1924c23f6e56a #v3.9.0
SHA512 fe7721bd4b4e4f7d31fd5a7e42d34d0c9735d062d8b146ee47a25f87c809eead7133265fc37fa958c37bc4ffeaf101d143202080508d98efd160b8fd0a278598
HEAD_REF master
)

vcpkg_configure_cmake(
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer
OPTIONS
-DCMAKE_CONFIG_DEST=share/rxspencer
-Drxshared=${BUILD_SHARED}
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH "share/rxspencer")
vcpkg_cmake_config_fixup(CONFIG_PATH "share/rxspencer")

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/regex)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/regex")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

vcpkg_copy_pdbs()
17 changes: 17 additions & 0 deletions ports/rxspencer/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "rxspencer",
"version": "3.9.0",
"description": "Henry Spencer's BSD regular expression library.",
"homepage": "https://garyhouston.github.io/regex/",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,8 +1384,6 @@ rtlsdr:x64-linux=fail
rtlsdr:x64-osx=fail
rttr:arm-uwp=fail
rttr:x64-uwp=fail
rxspencer:x64-uwp=fail
rxspencer:arm-uwp=fail
ryml:x64-osx=fail
ryu:arm-uwp=fail
ryu:x64-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5617,7 +5617,7 @@
"port-version": 0
},
"rxspencer": {
"baseline": "2020-01-12",
"baseline": "3.9.0",
"port-version": 0
},
"ryml": {
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/rxspencer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3b5bac6d89f6ae425bfe95a4309e72146f944dd",
"version": "3.9.0",
"port-version": 0
},
{
"git-tree": "a58f09c2e2ebb27d9b40527922b98612dd7e2de1",
"version-string": "2020-01-12",
Expand Down