diff --git a/ports/sdformat10/portfile.cmake b/ports/sdformat10/portfile.cmake index c09eac6f8e..2f316d2201 100644 --- a/ports/sdformat10/portfile.cmake +++ b/ports/sdformat10/portfile.cmake @@ -1,3 +1,4 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -39,4 +40,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sdformat10/vcpkg.json b/ports/sdformat10/vcpkg.json index 072cfe744d..4fd12c0451 100644 --- a/ports/sdformat10/vcpkg.json +++ b/ports/sdformat10/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdformat10", "version": "10.0.0", - "port-version": 4, + "port-version": 5, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "supports": "!uwp & !(arm & osx)", diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake index 187ef75ce6..c9346f1440 100644 --- a/ports/sdformat6/portfile.cmake +++ b/ports/sdformat6/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH 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_VERSION_PATH \"${CURRENT_PACKAGES_DIR}/share/sdformat/\"" "") # 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() diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json index ea49b4a056..6b094d7e41 100644 --- a/ports/sdformat6/vcpkg.json +++ b/ports/sdformat6/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdformat6", "version": "6.2.0", - "port-version": 7, + "port-version": 8, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index 8875dcbe08..f50c223912 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat @@ -39,4 +41,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json index 00b4a958b2..88037c6454 100644 --- a/ports/sdformat9/vcpkg.json +++ b/ports/sdformat9/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdformat9", "version": "9.8.0", - "port-version": 2, + "port-version": 3, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2f1eaf594c..8652827ea5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -393,6 +393,7 @@ gamenetworkingsockets:x64-android=fail # 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. gazebo:x64-windows=fail +gazebo:x64-windows-static-md=fail gazebo:x86-windows=fail gazebo:x64-linux=fail gdk-pixbuf:arm-neon-android=fail @@ -1041,9 +1042,6 @@ sciter:x64-windows=skip sciter:x64-windows-static=skip sciter:x64-windows-static-md=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:arm64-android=fail sdl1:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 80c7e173ad..ee9a46b926 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8066,7 +8066,7 @@ }, "sdformat10": { "baseline": "10.0.0", - "port-version": 4 + "port-version": 5 }, "sdformat13": { "baseline": "13.6.0", @@ -8074,11 +8074,11 @@ }, "sdformat6": { "baseline": "6.2.0", - "port-version": 7 + "port-version": 8 }, "sdformat9": { "baseline": "9.8.0", - "port-version": 2 + "port-version": 3 }, "sdl1": { "baseline": "1.2.15", diff --git a/versions/s-/sdformat10.json b/versions/s-/sdformat10.json index 9093cf70ef..b953e27f04 100644 --- a/versions/s-/sdformat10.json +++ b/versions/s-/sdformat10.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddcb4054c028e7f0c7e720afbd34aac10f542873", + "version": "10.0.0", + "port-version": 5 + }, { "git-tree": "1784f42c65cd5b0919a9d6c338bf1ab4f6022a9b", "version": "10.0.0", diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json index 0dc784aba6..b7cf475ecd 100644 --- a/versions/s-/sdformat6.json +++ b/versions/s-/sdformat6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ca1784b4c13148926ae2319b2abe62a5a2a6588", + "version": "6.2.0", + "port-version": 8 + }, { "git-tree": "e05708a69e80e295caedf2c503461686cabb5d3b", "version": "6.2.0", diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index b083a4e37b..7e22039082 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "503f117d4d158da0e32f0d9563260430e826648d", + "version": "9.8.0", + "port-version": 3 + }, { "git-tree": "faa40ee4c041f6c5d34acbc85008b8f939befc62", "version": "9.8.0",