Finish with the massive renaming

Signed-off-by: Jose Luis Rivero <[email protected]>
gazebosim · Nov 21, 2024 · 7b39a5c · 7b39a5c
1 parent 9f9c91a
commit 7b39a5c
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 75 deletions.
diff --git a/examples/c_child/CMakeLists.txt b/examples/c_child/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-c_child VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-core_no_deps REQUIRED)
+ign_find_package(ignition-c_no_deps REQUIRED)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${IGNITION-CORE_NO_DEPS_API_URL}")
diff --git a/examples/c_child/src/CMakeLists.txt b/examples/c_child/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-core_no_deps::ignition-core_no_deps)
+    ignition-c_no_deps::ignition-c_no_deps)
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/c_child_private/CMakeLists.txt b/examples/c_child_private/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-c_child_private VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-core_no_deps PRIVATE REQUIRED)
+ign_find_package(ignition-c_no_deps PRIVATE REQUIRED)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${IGNITION-CORE_NO_DEPS_API_URL}")
diff --git a/examples/c_child_private/src/CMakeLists.txt b/examples/c_child_private/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PRIVATE
-    ignition-core_no_deps::ignition-core_no_deps)
+    ignition-c_no_deps::ignition-c_no_deps)
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/c_nodep/src/AlmostEmpty.cc b/examples/c_nodep/src/AlmostEmpty.cc
@@ -19,7 +19,7 @@
 
 namespace gz
 {
-  namespace core_no_deps
+  namespace c_no_deps
   {
     class IGNITION_C_NO_DEPS_VISIBLE AlmostEmpty
     {

diff --git a/examples/c_nodep_static/src/AlmostEmpty.cc b/examples/c_nodep_static/src/AlmostEmpty.cc
@@ -19,7 +19,7 @@
 
 namespace gz
 {
-  namespace core_no_deps
+  namespace c_no_deps
   {
     class IGNITION_C_NO_DEPS_STATIC_VISIBLE AlmostEmpty
     {

diff --git a/examples/c_static_child/CMakeLists.txt b/examples/c_static_child/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-c_static_child VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-core_no_deps_static REQUIRED)
+ign_find_package(ignition-c_no_deps_static REQUIRED)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_STATIC_DOXYGEN_TAGFILE} = ${IGNITION-CORE_NO_DEPS_STATIC_API_URL}")
diff --git a/examples/c_static_child/README.md b/examples/c_static_child/README.md
@@ -1,9 +1,9 @@
 # core\_static\_child example
 
 This package links against that static library provided by
-the `core_no_deps_static` package.
+the `c_no_deps_static` package.
 
-To build, ensure that `core_no_deps_static` has been installed somewhere
+To build, ensure that `c_no_deps_static` has been installed somewhere
 in your `CMAKE_PREFIX_PATH` and then run:
 
 ~~~

diff --git a/examples/c_static_child/src/CMakeLists.txt b/examples/c_static_child/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-core_no_deps_static::ignition-core_no_deps_static)
+    ignition-c_no_deps_static::ignition-c_no_deps_static)
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-component_deps VERSION 0.1.0)
+project(ignition-comp_deps VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
 ign_configure_build(QUIT_IF_BUILD_ERRORS

diff --git a/examples/comp_deps/src/AlmostEmpty.cc b/examples/comp_deps/src/AlmostEmpty.cc
@@ -15,13 +15,13 @@
  *
 */
 
-#include <ignition/component_deps/Export.hh>
+#include <ignition/comp_deps/Export.hh>
 
 namespace gz
 {
-  namespace component_deps
+  namespace comp_deps
   {
-    class IGNITION_COMPONENT_DEPS_VISIBLE AlmostEmpty
+    class IGNITION_COMP_DEPS_VISIBLE AlmostEmpty
     {
     };
   }

diff --git a/examples/comp_depsA/CMakeLists.txt b/examples/comp_depsA/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(comp_depsA VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-component_deps REQUIRED COMPONENTS parent child)
+ign_find_package(ignition-comp_deps REQUIRED COMPONENTS parent child)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs()
diff --git a/examples/comp_depsA/src/CMakeLists.txt b/examples/comp_depsA/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-component_deps::ignition-component_deps-child)
+    ignition-comp_deps::ignition-comp_deps-child)
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/comp_depsB/CMakeLists.txt b/examples/comp_depsB/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(comp_depsB VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-component_deps REQUIRED COMPONENTS child parent)
+ign_find_package(ignition-comp_deps REQUIRED COMPONENTS child parent)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs()
diff --git a/examples/comp_depsB/README.md b/examples/comp_depsB/README.md
@@ -4,4 +4,4 @@ This package uses the `child` and `parent` components of `component\_deps`
 and calls `ign_find_package` with the components specified
 in the order `child parent`.
 Aside from the order in which the components are specified,
-this package is identical to `use_component_depsA`.
+this package is identical to `use_comp_depsA`.
diff --git a/examples/comp_depsB/src/CMakeLists.txt b/examples/comp_depsB/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-component_deps::ignition-component_deps-child)
+    ignition-comp_deps::ignition-comp_deps-child)
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/comp_depsC/CMakeLists.txt b/examples/comp_depsC/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(comp_depsC VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-component_deps REQUIRED COMPONENTS child)
+ign_find_package(ignition-comp_deps REQUIRED COMPONENTS child)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs()
diff --git a/examples/comp_depsC/src/CMakeLists.txt b/examples/comp_depsC/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-component_deps::ignition-component_deps-child)
+    ignition-comp_deps::ignition-comp_deps-child)
 ign_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/test_c_child_requires_c_no_deps.bash b/examples/test_c_child_requires_c_no_deps.bash
@@ -0,0 +1,54 @@
+#!/bin/bash
+TEST_STATUS=0
+
+echo
+echo Expect ignition-c_child to require ignition-c_no_deps
+pkg-config ignition-c_child --print-requires
+if ! pkg-config ignition-c_child --print-requires \
+  | grep ignition-c_no_deps
+then
+  echo oops
+  TEST_STATUS=1
+fi
+
+echo
+echo Expect ignition-c_child to not privately require ignition-c_no_deps
+pkg-config ignition-c_child --print-requires-private
+if pkg-config ignition-c_child --print-requires-private \
+  | grep ignition-c_no_deps
+then
+  echo oops
+  TEST_STATUS=1
+fi
+
+echo
+echo Expect ignition-c_child_private to privately require ignition-c_no_deps
+pkg-config ignition-c_child_private --print-requires-private
+if ! pkg-config ignition-c_child_private --print-requires-private \
+  | grep ignition-c_no_deps
+then
+  echo oops
+  TEST_STATUS=1
+fi
+
+echo
+echo Expect ignition-c_child_private to not require ignition-c_no_deps
+pkg-config ignition-c_child_private --print-requires
+if pkg-config ignition-c_child_private --print-requires \
+  | grep ignition-c_no_deps
+then
+  echo oops
+  TEST_STATUS=1
+fi
+
+echo
+if [[ $TEST_STATUS -eq 0 ]]
+then
+  echo Successfully detected ignition-c_nodep requirements
+  cp c_child_requires_c_nodep_pass.xml ../test_results/c_child_requires_c_nodep.xml
+  exit 0
+else
+  echo Could not detect all ignition-c_nodep requirements correctly
+  cp c_child_requires_c_nodep_fail.xml ../test_results/c_child_requires_c_nodep.xml
+  exit 1
+fi
diff --git a/examples/test_core_child_requires_core_no_deps.bash b/examples/test_core_child_requires_core_no_deps.bash