mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 17:02:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[console-bridge] Update to 1.0.2 (#24180)

Browse Source 
* Update console-bridge to 1.0.2

* Update CI baseline

* Address suggestions

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
This commit is contained in:
chausner 2022-04-19 01:36:32 +02:00 committed by GitHub
parent 68a85fa730
commit 9f3018fc93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ports/console-bridge/portfile.cmake
View File

@ -1,42 +1,40 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO ros/console_bridge REPO ros/console_bridge
REF 0a6c16ed68750837c32ed1cedee9fca7d61d4364 # 1.0.1 REF 1.0.2
SHA512 8b856bf8c0eec7d7f3f87e10c4de2b99369bd35cab5f9dd5ea3813fdd5a3fd4e7cd31b2336746920e093a515ad1175fd5af79f9d2f6a4648b1814b3131a1ef03 SHA512 ed427da8e59f9629f8d70e0a14415f88177c06fbaf7334bee56135dde91d19a1b54f5c9c668e0fd68314ab8dfd61446a174b9f528304decc5d4626a7c98882cb
HEAD_REF master HEAD_REF master
) )
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA OPTIONS
-DBUILD_TESTING=OFF
) )
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake")
vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/console_bridge) vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH CMake)
else() else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/console_bridge/cmake TARGET_PATH share/console_bridge) vcpkg_cmake_config_fixup(PACKAGE_NAME console_bridge CONFIG_PATH lib/console_bridge/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/console_bridge) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/console_bridge")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge")
endif() endif()
if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
endif() endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(READ ${SOURCE_PATH}/src/console.cpp _contents) file(READ "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" _contents)
string(SUBSTRING "${_contents}" 0 2000 license)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/console-bridge)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/console-bridge/copyright "${license}")
file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h _contents)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}") string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}")
else() else()
string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}") string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}")
endif() endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/include/console_bridge/console_bridge_export.h" "${_contents}")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

18
ports/console-bridge/vcpkg.json
View File

@ -1,7 +1,17 @@
{ {
"name": "console-bridge", "name": "console-bridge",
"version-string": "1.0.1", "version-semver": "1.0.2",
"port-version": 2, "description": "A ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.",
"description": "a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", "homepage": "https://github.com/ros/console_bridge",
"homepage": "https://github.com/ros/console_bridge" "license": "BSD-3-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
} }

4
versions/baseline.json
View File

@ -1521,8 +1521,8 @@
"port-version": 0 "port-version": 0
}, },
"console-bridge": { "console-bridge": {
"baseline": "1.0.1", "baseline": "1.0.2",
"port-version": 2 "port-version": 0
}, },
"constexpr": { "constexpr": {
"baseline": "1.0", "baseline": "1.0",

5
versions/c-/console-bridge.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "e5f1141775543ea0491358a281840ce2bcc100be",
"version-semver": "1.0.2",
"port-version": 0
},
{ {
"git-tree": "d73bd3ef8f9afac3c1f5957eda4ff760cea5b17c", "git-tree": "d73bd3ef8f9afac3c1f5957eda4ff760cea5b17c",
"version-string": "1.0.1", "version-string": "1.0.1",