From 7b39a5cbff47f0e4b60945e90a6db82ac90b51ba Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 21 Nov 2024 12:46:47 +0100 Subject: [PATCH] Finish with the massive renaming Signed-off-by: Jose Luis Rivero --- examples/c_child/CMakeLists.txt | 2 +- examples/c_child/src/CMakeLists.txt | 2 +- examples/c_child_private/CMakeLists.txt | 2 +- examples/c_child_private/src/CMakeLists.txt | 2 +- examples/c_nodep/src/AlmostEmpty.cc | 2 +- examples/c_nodep_static/src/AlmostEmpty.cc | 2 +- examples/c_static_child/CMakeLists.txt | 2 +- examples/c_static_child/README.md | 4 +- examples/c_static_child/src/CMakeLists.txt | 2 +- examples/comp_deps/CMakeLists.txt | 2 +- examples/comp_deps/src/AlmostEmpty.cc | 6 +-- examples/comp_depsA/CMakeLists.txt | 2 +- examples/comp_depsA/src/CMakeLists.txt | 2 +- examples/comp_depsB/CMakeLists.txt | 2 +- examples/comp_depsB/README.md | 2 +- examples/comp_depsB/src/CMakeLists.txt | 2 +- examples/comp_depsC/CMakeLists.txt | 2 +- examples/comp_depsC/src/CMakeLists.txt | 2 +- examples/test_c_child_requires_c_no_deps.bash | 54 +++++++++++++++++++ ...test_core_child_requires_core_no_deps.bash | 54 ------------------- 20 files changed, 75 insertions(+), 75 deletions(-) create mode 100755 examples/test_c_child_requires_c_no_deps.bash delete mode 100755 examples/test_core_child_requires_core_no_deps.bash diff --git a/examples/c_child/CMakeLists.txt b/examples/c_child/CMakeLists.txt index 1cd60552..ee1afe6c 100644 --- 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 index 82c11722..9ea9a1a4 100644 --- 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 index d61d2782..42507953 100644 --- 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 index 29014808..11317c4c 100644 --- 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 index 496ee066..9105cd06 100644 --- 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 index 7f296d1b..37920a29 100644 --- 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 index 38c635ce..9a0c7e1e 100644 --- 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 index 0f85f2e9..9589ccd7 100644 --- 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 index 400f4ecd..92fa68fd 100644 --- 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 index e8d3685f..34f9d1d9 100644 --- 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 index bb7e0350..f61c7e57 100644 --- a/examples/comp_deps/src/AlmostEmpty.cc +++ b/examples/comp_deps/src/AlmostEmpty.cc @@ -15,13 +15,13 @@ * */ -#include +#include 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 index c0ec04a4..355ae846 100644 --- 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 index 1344fa3f..fc7f341f 100644 --- 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 index 9750f894..b583d89f 100644 --- 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 index 5102107a..7d684d44 100644 --- 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 index 1344fa3f..fc7f341f 100644 --- 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 index f681e7d3..ff08860f 100644 --- 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 index 1344fa3f..fc7f341f 100644 --- 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 new file mode 100755 index 00000000..89e18890 --- /dev/null +++ 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 deleted file mode 100755 index 9febf845..00000000 --- a/examples/test_core_child_requires_core_no_deps.bash +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -TEST_STATUS=0 - -echo -echo Expect ignition-core_child to require ignition-core_no_deps -pkg-config ignition-core_child --print-requires -if ! pkg-config ignition-core_child --print-requires \ - | grep ignition-core_no_deps -then - echo oops - TEST_STATUS=1 -fi - -echo -echo Expect ignition-core_child to not privately require ignition-core_no_deps -pkg-config ignition-core_child --print-requires-private -if pkg-config ignition-core_child --print-requires-private \ - | grep ignition-core_no_deps -then - echo oops - TEST_STATUS=1 -fi - -echo -echo Expect ignition-core_child_private to privately require ignition-core_no_deps -pkg-config ignition-core_child_private --print-requires-private -if ! pkg-config ignition-core_child_private --print-requires-private \ - | grep ignition-core_no_deps -then - echo oops - TEST_STATUS=1 -fi - -echo -echo Expect ignition-core_child_private to not require ignition-core_no_deps -pkg-config ignition-core_child_private --print-requires -if pkg-config ignition-core_child_private --print-requires \ - | grep ignition-core_no_deps -then - echo oops - TEST_STATUS=1 -fi - -echo -if [[ $TEST_STATUS -eq 0 ]] -then - echo Successfully detected ignition-core_nodep requirements - cp core_child_requires_core_nodep_pass.xml ../test_results/core_child_requires_core_nodep.xml - exit 0 -else - echo Could not detect all ignition-core_nodep requirements correctly - cp core_child_requires_core_nodep_fail.xml ../test_results/core_child_requires_core_nodep.xml - exit 1 -fi