From af39e886f79f975143cc014ae80cc7508db41b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Thu, 10 Oct 2024 17:24:36 +0200 Subject: [PATCH] Bump main to gz-msgs 12.0.0~pre1 (#468) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- CMakeLists.txt | 4 ++-- Changelog.md | 4 ++++ core/src/MessageFactory.cc | 2 +- examples/generating_custom_msgs/CMakeLists.txt | 4 ++-- examples/using_gz_msgs/CMakeLists.txt | 4 ++-- examples/using_gz_msgs/README.md | 4 ++-- package.xml | 4 ++-- python/CMakeLists.txt | 2 +- python/test/basic_TEST.py | 2 +- tutorials/cppgetstarted.md | 2 +- tutorials/message_generation.md | 10 +++++----- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fe174a2..d989938b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(gz-msgs11 VERSION 11.0.0) +project(gz-msgs12 VERSION 12.0.0) #============================================================================ # Find gz-cmake @@ -17,7 +17,7 @@ find_package(gz-cmake4 REQUIRED) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -gz_configure_project(VERSION_SUFFIX +gz_configure_project(VERSION_SUFFIX pre1 CONFIG_EXTRAS "gz-msgs-extras.cmake.in") #============================================================================ diff --git a/Changelog.md b/Changelog.md index c8c00d23..a6a0c3f6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +## Gazebo Msgs 12.x + +### Gazebo Msgs 12.0.0 (20XX-XX-XX) + ## Gazebo Msgs 11.x ### Gazebo Msgs 11.0.0 (2024-09-25) diff --git a/core/src/MessageFactory.cc b/core/src/MessageFactory.cc index 5597d66d..f246d877 100644 --- a/core/src/MessageFactory.cc +++ b/core/src/MessageFactory.cc @@ -102,7 +102,7 @@ MessageFactory::MessagePtr MessageFactory::New( { std::cerr << "Message (" << kGzMsgsPrefix + type << ") was retrieved with non-fully qualified name. " - << "This behavior is deprecated in msgs11" << std::endl; + << "This behavior is deprecated in msgs12" << std::endl; } } return ret; diff --git a/examples/generating_custom_msgs/CMakeLists.txt b/examples/generating_custom_msgs/CMakeLists.txt index 3716df8f..fd5f7dd3 100644 --- a/examples/generating_custom_msgs/CMakeLists.txt +++ b/examples/generating_custom_msgs/CMakeLists.txt @@ -10,9 +10,9 @@ project(generating_custom_messages VERSION 1.0.0) #============================================================================ find_package(gz-cmake4 REQUIRED) -find_package(gz-msgs11 REQUIRED) +find_package(gz-msgs12 REQUIRED) # Define a variable 'GZ_MSGS_VER' holding the version number -set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) +set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR}) # Define a variable 'MSGS_PROTOS' listing the .proto files set(MSGS_PROTOS diff --git a/examples/using_gz_msgs/CMakeLists.txt b/examples/using_gz_msgs/CMakeLists.txt index 44b3dde0..4cb485a4 100644 --- a/examples/using_gz_msgs/CMakeLists.txt +++ b/examples/using_gz_msgs/CMakeLists.txt @@ -10,8 +10,8 @@ project(using_gz_msgs VERSION 1.0.0) #============================================================================ find_package(gz-cmake4 REQUIRED) -find_package(gz-msgs11 REQUIRED) -set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) +find_package(gz-msgs12 REQUIRED) +set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR}) add_executable(${PROJECT_NAME} main.cc) target_link_libraries(${PROJECT_NAME} PRIVATE gz-msgs${GZ_MSGS_VER}) diff --git a/examples/using_gz_msgs/README.md b/examples/using_gz_msgs/README.md index 8bf2a982..1ce98dfd 100644 --- a/examples/using_gz_msgs/README.md +++ b/examples/using_gz_msgs/README.md @@ -5,8 +5,8 @@ The example in this folder demonstrates how to use messages as part of your buil To use messages as part of your project, simply find the gz-msgs package ``` -find_package(gz-msgs11 REQUIRED) -set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR} +find_package(gz-msgs12 REQUIRED) +set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR} ``` And link the messages library to your library or executable diff --git a/package.xml b/package.xml index 7a673e11..becd0f21 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ - gz-msgs11 - 11.0.0 + gz-msgs12 + 12.0.0 Gazebo Messages: Protobuf messages and functions for robot applications Carlos Agüero Apache License 2.0 diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index edb6c84c..02e13dab 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,7 +1,7 @@ # Append `_configured` to the file name so it doesn't interfere with tests. # This happens because pytest will load the `gz.msgs` package from the build directory # (because there's an __init__.py file there) instead of being redirected to -# `gz.msgs11` in the install directory, which is the intent of this `__init__.py` file. +# `gz.msgs12` in the install directory, which is the intent of this `__init__.py` file. set(python_init_file ${PROJECT_BINARY_DIR}/python/gz/${GS_DESIGNATION}/__init__.py_configured) configure_file(${PROJECT_SOURCE_DIR}/python/src/__init__.py.in ${python_init_file}) diff --git a/python/test/basic_TEST.py b/python/test/basic_TEST.py index 436ba419..1c4b4864 100644 --- a/python/test/basic_TEST.py +++ b/python/test/basic_TEST.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gz.msgs11.vector3d_pb2 import Vector3d +from gz.msgs12.vector3d_pb2 import Vector3d import unittest diff --git a/tutorials/cppgetstarted.md b/tutorials/cppgetstarted.md index d9970fe1..a9c955d7 100644 --- a/tutorials/cppgetstarted.md +++ b/tutorials/cppgetstarted.md @@ -63,7 +63,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) project(gz-msgs-example) # Find the Gazebo msgs library -find_package(gz-msgs11 QUIET REQUIRED) +find_package(gz-msgs12 QUIET REQUIRED) add_executable(gz-msgs-example main.cc) target_link_libraries(gz-msgs-example ${GZ-MSGS_LIBRARIES}) diff --git a/tutorials/message_generation.md b/tutorials/message_generation.md index 22820469..bf119c01 100644 --- a/tutorials/message_generation.md +++ b/tutorials/message_generation.md @@ -123,13 +123,13 @@ The code for this example can be found in the `gz-msgs` [repository](https://git The `cmake` functionality is exported from the `gz-msgs` library, via the `gz-cmake` [`extras` functionality](https://github.com/gazebosim/gz-cmake/pull/345). -To make the functions available, simply `find_package(gz-msgs11)` in your `CMakeLists.txt`: +To make the functions available, simply `find_package(gz-msgs12)` in your `CMakeLists.txt`: ```cmake cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) project(my_custom_package VERSION 0.0.1) find_package(gz-cmake4 REQUIRED) -find_package(gz-msgs11 REQUIRED) +find_package(gz-msgs12 REQUIRED) ``` @@ -215,7 +215,7 @@ gz_msgs_generate_messages( # List of proto files to process MSGS_PROTOS ${MSGS_PROTOS} # Depenency on gz-msgs - DEPENDENCIES gz-msgs11::gz-msgs11 + DEPENDENCIES gz-msgs12::gz-msgs12 ) ``` @@ -223,8 +223,8 @@ In order to reduce the amount of edits needed upon a version change of `gz-msgs` - Define a variable `GZ_MSGS_VER`, holding the version number: ```cmake - find_package(gz-msgs11 REQUIRED) - set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) + find_package(gz-msgs12 REQUIRED) + set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR}) ``` - And change the dependency line in above code block to: ```cmake