Bump gz-cmake and others in jetty (#175)

* Bumping gz-cmake and others except gz-tools.
* Disable jammy CI, codecov
* Change exe target name to avoid name collision
* Improve robustness to whitespace in gz_TEST

The amount of indentation in `gz plugin --help` can vary,
so add a helper function that looks for two substrings
separated only by spaces and use it instead of hard-coding
the expected amount of whitespace.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Author: scpeters

.github/ci/packages.apt

@@ -1,3 +1,3 @@
-libgz-cmake4-dev
+libgz-cmake5-dev
 libgz-tools2-dev
-libgz-utils3-cli-dev
+libgz-utils4-cli-dev

.github/workflows/ci.yml

@@ -9,17 +9,6 @@ on:
       - 'main'
 
 jobs:
-  jammy-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Jammy CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Compile and test
-        id: ci
-        uses: gazebo-tooling/action-gz-ci@jammy
-        with:
-          codecov-enabled: true
   noble-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Noble CI
@@ -30,6 +19,7 @@ jobs:
         id: ci
         uses: gazebo-tooling/action-gz-ci@noble
         with:
+          # codecov-enabled: true
           cppcheck-enabled: true
           cpplint-enabled: true
           doxygen-enabled: true

CMakeLists.txt

@@ -3,13 +3,12 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-plugin4 VERSION 4.0.0)
+project(gz-plugin VERSION 4.0.0)
 
 #============================================================================
 # Find gz-cmake
 #============================================================================
-find_package(gz-cmake4 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
+find_package(gz-cmake REQUIRED)
 
 #============================================================================
 # Configure the project
@@ -49,8 +48,7 @@ set(GZ_TOOLS_VER 2)
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
-set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
+gz_find_package(gz-utils REQUIRED COMPONENTS cli)
 
 #============================================================================
 # Configure the build

MigrationFromCommon.md

@@ -11,15 +11,15 @@ framework. Some of the instructions here may also be useful to new adopters of
 just wants to use `PluginPtr` objects can link to `core`, e.g.:
 
 ```
-target_link_libraries(my_target PUBLIC gz-plugin3::core)
+target_link_libraries(my_target PUBLIC gz-plugin::core)
 ```
 
 However, if your code wants to be able to load plugins, it should link to the
 `loader` component. In most cases, it should probably link privately, unless you
 need the `gz::plugin::Loader` class to be part of your library's API:
 
 ```
-target_link_libraries(my_target PRIVATE gz-plugin3::loader)
+target_link_libraries(my_target PRIVATE gz-plugin::loader)
 ```
 
 If `gz::plugin::PluginPtr` objects are part of your library's API, then
@@ -28,9 +28,9 @@ you may want `loader` to be private while `core` is public:
 ```
 target_link_libraries(my_target
   PUBLIC
-    gz-plugin3::core
+    gz-plugin::core
   PRIVATE
-    gz-plugin3::loader
+    gz-plugin::loader
 )
 ```
 
@@ -39,7 +39,7 @@ then you should link against the `register` component. This should almost always
 be a private link, since plugin registration is purely internal for a library:
 
 ```
-target_link_libraries(my_plugin PRIVATE gz-plugin3::register)
+target_link_libraries(my_plugin PRIVATE gz-plugin::register)
 ```
 
 # Registering a plugin

core/CMakeLists.txt

@@ -8,7 +8,7 @@ gz_create_core_library(
 )
 
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
-  PUBLIC gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER})
+  PUBLIC gz-utils::gz-utils)
 
 # Build the unit tests
 gz_build_tests(

examples/CMakeLists.txt

@@ -2,14 +2,11 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
 project(examples)
 
-find_package(gz-plugin4 QUIET REQUIRED COMPONENTS all)
-set(GZ_PLUGIN_VER ${gz-plugin4_VERSION_MAJOR})
+find_package(gz-plugin QUIET REQUIRED COMPONENTS all)
 
-find_package(gz-common6 QUIET)
-set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
+find_package(gz-common QUIET)
 
-find_package(gz-math8 QUIET)
-set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
+find_package(gz-math QUIET)
 
 add_subdirectory(plugins)
 
@@ -30,9 +27,9 @@ foreach(example_file ${example_files})
 
   target_link_libraries(${example}
     PRIVATE
-      gz-plugin${GZ_PLUGIN_VER}::loader
-      gz-common${GZ_COMMON_VER}::core
-      gz-math${GZ_MATH_VER}::core
+      gz-plugin::loader
+      gz-common::core
+      gz-math::core
   )
 
   # This is only needed for the examples that use plugins, but it doesn't hurt

examples/plugins/CMakeLists.txt

@@ -13,8 +13,8 @@ foreach(plugin_file ${plugin_files})
 
   target_link_libraries(${plugin}
     PRIVATE
-      gz-plugin${GZ_PLUGIN_VER}::register
-      gz-math${GZ_MATH_VER}::core)
+      gz-plugin::register
+      gz-math::core)
 
   # All these libraries will go into the same directory, so it's sufficient for
   # us to grab the last one.

loader/src/cmd/CMakeLists.txt

@@ -4,11 +4,17 @@ target_link_libraries(gz PUBLIC
   ${PROJECT_LIBRARY_TARGET_NAME}
 )
 
-set(plugin_executable gz-plugin)
+# Define the desired output name of the executable
+set(plugin_executable_output_name gz-plugin)
+# Append "-exe" to cmake target name to differ from the library target name
+set(plugin_executable gz-plugin-exe)
 add_executable(${plugin_executable} plugin_main.cc)
+set_target_properties(${plugin_executable}
+  PROPERTIES OUTPUT_NAME ${plugin_executable_output_name})
+
 target_link_libraries(${plugin_executable}
   gz
-  gz-utils${GZ_UTILS_VER}::cli
+  gz-utils::cli
   ${loader}
 )
 

loader/src/gz_TEST.cc

@@ -57,27 +57,41 @@ std::string custom_exec_str(std::string _cmd)
   return result;
 }
 
+//////////////////////////////////////////////////
+/// \brief Verify that two substrings are found within a larger string,
+/// separated only by spaces
+void verifySpaceSeparatedSubstrings(const std::string &_stringToSearch,
+                                    const std::string &_substring1,
+                                    const std::string &_substring2)
+{
+  auto iterator1 = _stringToSearch.find(_substring1);
+  EXPECT_NE(std::string::npos, iterator1)
+    << " failed to find \"" << _substring1 << "\" in:\n" << _stringToSearch;
+  ASSERT_LE(iterator1 + _substring1.size(), _stringToSearch.size());
+  auto iterator2 =
+      _stringToSearch.find_first_not_of(' ', iterator1 + _substring1.size());
+  EXPECT_NE(std::string::npos, iterator2);
+  ASSERT_LE(iterator2 + _substring2.size(), _stringToSearch.size());
+  EXPECT_EQ(_substring2, _stringToSearch.substr(iterator2, _substring2.size()));
+}
+
 //////////////////////////////////////////////////
 /// \brief Check 'gz plugin --help'.
-TEST(gzTest, IgnPluginHelp)
+TEST(gzTest, GzPluginHelp)
 {
   // Path to gz executable
   std::string gz = std::string(GZ_PATH);
   std::string output = custom_exec_str(gz + " plugin --help");
-  EXPECT_NE(std::string::npos,
-    output.find("-i [--info]                 Get info about a plugin."))
-      << output;
-  EXPECT_NE(std::string::npos,
-    output.find("-p [--plugin] TEXT          Path to a plugin."))
-      << output;
+  verifySpaceSeparatedSubstrings(
+      output, "-i [--info]", "Get info about a plugin.");
+  verifySpaceSeparatedSubstrings(
+      output, "-p [--plugin] TEXT", "Path to a plugin.");
 
   output = custom_exec_str(gz + " plugin");
-  EXPECT_NE(std::string::npos,
-    output.find("-i [--info]                 Get info about a plugin."))
-      << output;
-  EXPECT_NE(std::string::npos,
-    output.find("-p [--plugin] TEXT          Path to a plugin."))
-      << output;
+  verifySpaceSeparatedSubstrings(
+      output, "-i [--info]", "Get info about a plugin.");
+  verifySpaceSeparatedSubstrings(
+      output, "-p [--plugin] TEXT", "Path to a plugin.");
 }
 
 //////////////////////////////////////////////////

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>gz-plugin4</name>
+  <name>gz-plugin</name>
   <version>4.0.0</version>
   <description>Gazebo Plugin : Cross-platform C++ library for dynamically loading plugins.</description>
   <maintainer email="ahcorde@gmail.com">Alejandro Hernández Cordero</maintainer>
@@ -10,10 +10,10 @@
 
   <buildtool_depend>cmake</buildtool_depend>
 
-  <build_depend>gz-cmake4</build_depend>
+  <build_depend>gz-cmake</build_depend>
 
   <depend>gz-tools2</depend>
-  <depend>gz-utils3</depend>
+  <depend>gz-utils</depend>
 
   <export>
     <build_type>cmake</build_type>