3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-13 20:28:26 +08:00
Code Issues Projects Releases Wiki Activity

[sdformat6,sdformat9,sdformat10] Workaround POST_BUILD_CHECKS_FAILED (#40572)

Browse Source 
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
This commit is contained in:
Lily Wang 2024-08-29 00:26:09 -07:00 committed by GitHub
parent de99811b2b
commit d236fe3b74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/sdformat10/portfile.cmake
View File

@ -1,3 +1,4 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
@ -39,4 +40,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share") "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

2
ports/sdformat10/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "sdformat10", "name": "sdformat10",
"version": "10.0.0", "version": "10.0.0",
"port-version": 4, "port-version": 5,
"description": "Simulation Description Format (SDF) parser and description files.", "description": "Simulation Description Format (SDF) parser and description files.",
"homepage": "http://sdformat.org/", "homepage": "http://sdformat.org/",
"supports": "!uwp & !(arm & osx)", "supports": "!uwp & !(arm & osx)",

4
ports/sdformat6/portfile.cmake
View File

@ -1,3 +1,5 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO osrf/sdformat REPO osrf/sdformat
@ -54,6 +56,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ignition/sdformat6.yaml" "${
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_SHARE_PATH \"${CURRENT_PACKAGES_DIR}/share/\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_SHARE_PATH \"${CURRENT_PACKAGES_DIR}/share/\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_VERSION_PATH \"${CURRENT_PACKAGES_DIR}/share/sdformat/\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_VERSION_PATH \"${CURRENT_PACKAGES_DIR}/share/sdformat/\"" "")
# Handle copyright # Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()

2
ports/sdformat6/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "sdformat6", "name": "sdformat6",
"version": "6.2.0", "version": "6.2.0",
"port-version": 7, "port-version": 8,
"description": "Simulation Description Format (SDF) parser and description files.", "description": "Simulation Description Format (SDF) parser and description files.",
"homepage": "http://sdformat.org/", "homepage": "http://sdformat.org/",
"license": "Apache-2.0", "license": "Apache-2.0",

4
ports/sdformat9/portfile.cmake
View File

@ -1,3 +1,5 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO osrf/sdformat REPO osrf/sdformat
@ -39,4 +41,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share") "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright # Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

2
ports/sdformat9/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "sdformat9", "name": "sdformat9",
"version": "9.8.0", "version": "9.8.0",
"port-version": 2, "port-version": 3,
"description": "Simulation Description Format (SDF) parser and description files.", "description": "Simulation Description Format (SDF) parser and description files.",
"homepage": "http://sdformat.org/", "homepage": "http://sdformat.org/",
"license": "Apache-2.0", "license": "Apache-2.0",

4
scripts/ci.baseline.txt
View File

@ -393,6 +393,7 @@ gamenetworkingsockets:x64-android=fail
# gazebo is broken due it depend on old ports that already in the new versions. # gazebo is broken due it depend on old ports that already in the new versions.
# There is an open PR that try to fix that. # There is an open PR that try to fix that.
gazebo:x64-windows=fail gazebo:x64-windows=fail
gazebo:x64-windows-static-md=fail
gazebo:x86-windows=fail gazebo:x86-windows=fail
gazebo:x64-linux=fail gazebo:x64-linux=fail
gdk-pixbuf:arm-neon-android=fail gdk-pixbuf:arm-neon-android=fail
@ -1041,9 +1042,6 @@ sciter:x64-windows=skip
sciter:x64-windows-static=skip sciter:x64-windows-static=skip
sciter:x64-windows-static-md=skip sciter:x64-windows-static-md=skip
sciter:x86-windows=skip sciter:x86-windows=skip
sdformat10:x64-windows-static-md=fail
sdformat6:x64-windows-static-md=fail
sdformat9:x64-windows-static-md=fail
sdl1:arm-neon-android=fail sdl1:arm-neon-android=fail
sdl1:arm64-android=fail sdl1:arm64-android=fail
sdl1:x64-android=fail sdl1:x64-android=fail

6
versions/baseline.json
View File

@ -8066,7 +8066,7 @@
}, },
"sdformat10": { "sdformat10": {
"baseline": "10.0.0", "baseline": "10.0.0",
"port-version": 4 "port-version": 5
}, },
"sdformat13": { "sdformat13": {
"baseline": "13.6.0", "baseline": "13.6.0",
@ -8074,11 +8074,11 @@
}, },
"sdformat6": { "sdformat6": {
"baseline": "6.2.0", "baseline": "6.2.0",
"port-version": 7 "port-version": 8
}, },
"sdformat9": { "sdformat9": {
"baseline": "9.8.0", "baseline": "9.8.0",
"port-version": 2 "port-version": 3
}, },
"sdl1": { "sdl1": {
"baseline": "1.2.15", "baseline": "1.2.15",

5
versions/s-/sdformat10.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ddcb4054c028e7f0c7e720afbd34aac10f542873",
"version": "10.0.0",
"port-version": 5
},
{ {
"git-tree": "1784f42c65cd5b0919a9d6c338bf1ab4f6022a9b", "git-tree": "1784f42c65cd5b0919a9d6c338bf1ab4f6022a9b",
"version": "10.0.0", "version": "10.0.0",

5
versions/s-/sdformat6.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "4ca1784b4c13148926ae2319b2abe62a5a2a6588",
"version": "6.2.0",
"port-version": 8
},
{ {
"git-tree": "e05708a69e80e295caedf2c503461686cabb5d3b", "git-tree": "e05708a69e80e295caedf2c503461686cabb5d3b",
"version": "6.2.0", "version": "6.2.0",

5
versions/s-/sdformat9.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "503f117d4d158da0e32f0d9563260430e826648d",
"version": "9.8.0",
"port-version": 3
},
{ {
"git-tree": "faa40ee4c041f6c5d34acbc85008b8f939befc62", "git-tree": "faa40ee4c041f6c5d34acbc85008b8f939befc62",
"version": "9.8.0", "version": "9.8.0",