зеркало из https://github.com/microsoft/vcpkg.git
[robotraconteur] Update to version 1.2.1 (#38939)
- [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] The "supports" clause reflects platforms that may be fixed by this new version. - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
This commit is contained in:
Родитель
b781a5aeb3
Коммит
1f61030b78
|
@ -1,39 +0,0 @@
|
|||
RobotRaconteurCore/src/LocalTransport.cpp | 2 +-
|
||||
RobotRaconteurCore/src/TcpTransport.cpp | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/RobotRaconteurCore/src/LocalTransport.cpp b/RobotRaconteurCore/src/LocalTransport.cpp
|
||||
index c297a3d..4c55446 100644
|
||||
--- a/RobotRaconteurCore/src/LocalTransport.cpp
|
||||
+++ b/RobotRaconteurCore/src/LocalTransport.cpp
|
||||
@@ -1879,7 +1879,7 @@ void FindNodesInDirectory(std::vector<NodeDiscoveryInfo>& nodeinfo, const boost:
|
||||
|
||||
NodeID nodeid(nodeid1->second);
|
||||
|
||||
- if (nodename1->second != boost::filesystem::change_extension(dir_itr->path().filename(), ""))
|
||||
+ if (nodename1->second != dir_itr->path().filename().replace_extension(""))
|
||||
{
|
||||
// TODO: Test?
|
||||
continue;
|
||||
diff --git a/RobotRaconteurCore/src/TcpTransport.cpp b/RobotRaconteurCore/src/TcpTransport.cpp
|
||||
index 551b3a5..7d348f2 100644
|
||||
--- a/RobotRaconteurCore/src/TcpTransport.cpp
|
||||
+++ b/RobotRaconteurCore/src/TcpTransport.cpp
|
||||
@@ -6634,7 +6634,7 @@ void TcpTransportPortSharerClient::client_thread()
|
||||
p1 /= "tcp";
|
||||
p1 /= "portsharer";
|
||||
p1 /= "portsharer.info";
|
||||
- p1.normalize();
|
||||
+ p1.lexically_normal();
|
||||
|
||||
ROBOTRACONTEUR_LOG_TRACE_COMPONENT(node, Transport, -1, "Looking for portsharer.info in " << p1);
|
||||
|
||||
@@ -6658,7 +6658,7 @@ void TcpTransportPortSharerClient::client_thread()
|
||||
p1 /= "tcp";
|
||||
p1 /= "portsharer";
|
||||
p1 /= "portsharer.info";
|
||||
- p1.normalize();
|
||||
+ p1.lexically_normal();
|
||||
|
||||
ROBOTRACONTEUR_LOG_TRACE_COMPONENT(node, Transport, -1, "Looking for portsharer.info in " << p1);
|
||||
|
|
@ -6,9 +6,8 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO robotraconteur/robotraconteur
|
||||
REF "v${VERSION}"
|
||||
SHA512 39926abd6f4b66c528abade88c06e62a5d9e1c2d12fc1f235d6491b7b6e36eec18923a222a60420e98d3a57b86611483d62319227d91915a747aa7dc731dc5be
|
||||
SHA512 7c155dd992253663d259da32a7cc3db00c5377802098cd8ab1a381c8a1371e8a42b600bacc9279329923cdaf4081e39b77b10238b39f57f701f58a6862e3632e
|
||||
HEAD_REF master
|
||||
PATCHES fix-compatibility-with-boost-1.85.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "robotraconteur",
|
||||
"version-semver": "1.2.0",
|
||||
"port-version": 1,
|
||||
"version-semver": "1.2.1",
|
||||
"description": "The Robot Raconteur communication framework core library",
|
||||
"homepage": "https://www.robotraconteur.com",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
@ -7757,8 +7757,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"robotraconteur": {
|
||||
"baseline": "1.2.0",
|
||||
"port-version": 1
|
||||
"baseline": "1.2.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"robotraconteur-companion": {
|
||||
"baseline": "0.3.1",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0e34e3482a83197c388357b0ad61179cf03f1967",
|
||||
"version-semver": "1.2.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "1d871d5b5f391925c534c6a801ecd7e644ffaa30",
|
||||
"version-semver": "1.2.0",
|
||||
|
|
Загрузка…
Ссылка в новой задаче