From 357e90332f3a2b299ccc829be9e45992ee72bb14 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 11 Jul 2022 16:59:22 -0700 Subject: [PATCH] Greedy ign- migrations Signed-off-by: methylDragon --- CMakeLists.txt | 6 ++---- Changelog.md | 2 +- README.md | 2 +- examples/CMakeLists.txt | 2 +- examples/sim_plugins.gzlaunch | 16 ++++++++-------- plugins/sim_gui/SimGui.hh | 2 +- src/Manager_TEST.cc | 12 ++++++------ src/cmd/CMakeLists.txt | 2 +- src/cmd/cmdlaunch.rb.in | 2 +- src/cmd/gz_TEST.cc | 2 +- src/cmd/launch.yaml.in | 2 +- src/cmd/launch_main.cc | 2 +- 12 files changed, 25 insertions(+), 27 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b093eb6b..20d13a58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -gz_configure_project( - REPLACE_GZ_INCLUDE_PATH gz/launch - VERSION_SUFFIX) +gz_configure_project(VERSION_SUFFIX) #============================================================================ # Set project-specific options @@ -112,7 +110,7 @@ add_subdirectory(plugins) gz_configure_build(QUIT_IF_BUILD_ERRORS) #============================================================================ -# install example .ign files +# install example .gzlaunch files #============================================================================ add_subdirectory(examples) diff --git a/Changelog.md b/Changelog.md index 021f9ff7..41aea020 100644 --- a/Changelog.md +++ b/Changelog.md @@ -254,7 +254,7 @@ ### Gazebo Launch 1.3.0 (2019-11-13) -1. Add filepath to ERB so that constants like `__FILE__` in `.ign` files work as expected +1. Add filepath to ERB so that constants like `__FILE__` in `.gzlaunch` files work as expected * [BitBucket pull request 48](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-launch/pull-requests/48) 1. Add backward support to gz-launch to capture backtraces. diff --git a/README.md b/README.md index 7935597a..ed3cf614 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ Refer to the following table for information about important directories and fil ``` gz-launch ├── examples Example launch configurations. -├── include/ignition/launch Header files. +├── include/gz/launch Header files. ├── plugins Launch plugins, one per subdirectory. ├── src Source files and unit tests. ├── test diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 4549a537..2d069060 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,3 +1,3 @@ -file(GLOB files "*.ign") +file(GLOB files "*.gzlaunch") install(FILES ${files} DESTINATION ${GZ_DATA_INSTALL_DIR}/configs) diff --git a/examples/sim_plugins.gzlaunch b/examples/sim_plugins.gzlaunch index 489a457c..aae71c0b 100644 --- a/examples/sim_plugins.gzlaunch +++ b/examples/sim_plugins.gzlaunch @@ -121,11 +121,11 @@ In this example, setting to a resource file shipped with Gazebo GUI --> :/qml/images/drawer.png - + 3D View false docked - + ogre2 scene @@ -134,7 +134,7 @@ -6 0 6 0 0.5 0 - + World control false false @@ -147,7 +147,7 @@ - + true true @@ -158,7 +158,7 @@ - + World stats false false @@ -171,7 +171,7 @@ - + true true @@ -182,9 +182,9 @@ - + Entity tree - + diff --git a/plugins/sim_gui/SimGui.hh b/plugins/sim_gui/SimGui.hh index 327f05a1..81a214a9 100644 --- a/plugins/sim_gui/SimGui.hh +++ b/plugins/sim_gui/SimGui.hh @@ -41,7 +41,7 @@ namespace gz /// /// - /// + /// /// /// /// Custom window title diff --git a/src/Manager_TEST.cc b/src/Manager_TEST.cc index 740cc713..b2742249 100644 --- a/src/Manager_TEST.cc +++ b/src/Manager_TEST.cc @@ -30,10 +30,10 @@ class ManagerTest : public ::testing::Test public: ManagerTest(){} #ifndef _WIN32 - std::string testScriptPath = "/tmp/ign-launch.sh"; + std::string testScriptPath = "/tmp/gz-launch.sh"; #else std::string testScriptPath = - std::string(getenv("localappdata")) + "\\Temp\\ign-launch.bat"; + std::string(getenv("localappdata")) + "\\Temp\\gz-launch.bat"; #endif }; @@ -141,10 +141,10 @@ TEST_F(ManagerTest, RunEnvPre) { // Test that environment is applied regardless of order #ifndef _WIN32 - std::string testPath = "/tmp/ign-launch-env-test-pre"; + std::string testPath = "/tmp/gz-launch-env-test-pre"; #else std::string testPath = - std::string(getenv("localappdata")) + "\\Temp\\ign-launch-env-test-pre"; + std::string(getenv("localappdata")) + "\\Temp\\gz-launch-env-test-pre"; #endif if (gz::common::isFile(testPath)) @@ -179,10 +179,10 @@ TEST_F(ManagerTest, RunEnvPost) { // Test that environment is applied regardless of order #ifndef _WIN32 - std::string testPath = "/tmp/ign-launch-env-test-post"; + std::string testPath = "/tmp/gz-launch-env-test-post"; #else std::string testPath = - std::string(getenv("localappdata")) + "\\Temp\\ign-launch-env-test-post"; + std::string(getenv("localappdata")) + "\\Temp\\gz-launch-env-test-post"; #endif if (gz::common::isFile(testPath)) diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index f4288274..2b7ae184 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(gz PUBLIC gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER} ) -set(launch_executable ign-launch) +set(launch_executable gz-launch) add_executable(${launch_executable} launch_main.cc) target_link_libraries(${launch_executable} gz diff --git a/src/cmd/cmdlaunch.rb.in b/src/cmd/cmdlaunch.rb.in index 6f28304e..d60e14b2 100755 --- a/src/cmd/cmdlaunch.rb.in +++ b/src/cmd/cmdlaunch.rb.in @@ -21,7 +21,7 @@ COMMANDS = { } # -# Class for the Ignition launch command line tools. +# Class for the Gazebo launch command line tools. # class Cmd def execute(args) diff --git a/src/cmd/gz_TEST.cc b/src/cmd/gz_TEST.cc index 112c4f2c..b4b37350 100644 --- a/src/cmd/gz_TEST.cc +++ b/src/cmd/gz_TEST.cc @@ -81,7 +81,7 @@ TEST(CmdLine, HelpSelf) { std::string output = customExecStr("gz launch --help"); EXPECT_NE(std::string::npos, - output.find("Introspect Ignition launch")) << output; + output.find("Introspect Gazebo launch")) << output; } ///////////////////////////////////////////////// diff --git a/src/cmd/launch.yaml.in b/src/cmd/launch.yaml.in index c1c86c43..b85e38e5 100644 --- a/src/cmd/launch.yaml.in +++ b/src/cmd/launch.yaml.in @@ -1,4 +1,4 @@ ---- # Subcommands available inside ignition launch +--- # Subcommands available inside gz launch format: 1.0.0 library_name: @PROJECT_NAME_NO_VERSION@ library_version: @PROJECT_VERSION_FULL@ diff --git a/src/cmd/launch_main.cc b/src/cmd/launch_main.cc index 2813da55..74061c5f 100644 --- a/src/cmd/launch_main.cc +++ b/src/cmd/launch_main.cc @@ -168,7 +168,7 @@ void addLaunchFlags(CLI::App &_app) ////////////////////////////////////////////////// int main(int argc, char** argv) { - CLI::App app{"Introspect Ignition launch"}; + CLI::App app{"Introspect Gazebo launch"}; app.set_help_all_flag("--help-all", "Show all help");