Greedy ign- migrations

Signed-off-by: methylDragon <methylDragon@gmail.com>

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)
 

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.

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

examples/CMakeLists.txt

@@ -1,3 +1,3 @@
-file(GLOB files "*.ign")
+file(GLOB files "*.gzlaunch")
 install(FILES ${files}
   DESTINATION ${GZ_DATA_INSTALL_DIR}/configs)

examples/sim_plugins.gzlaunch

@@ -121,11 +121,11 @@
            In this example, setting to a resource file shipped with Gazebo GUI -->
       <window_icon>:/qml/images/drawer.png</window_icon>
       <plugin filename="GzScene3D" name="3D View">
-        <ignition-gui>
+        <gz-gui>
           <title>3D View</title>
           <property type="bool" key="showTitleBar">false</property>
           <property type="string" key="state">docked</property>
-        </ignition-gui>
+        </gz-gui>
 
         <engine>ogre2</engine>
         <scene>scene</scene>
@@ -134,7 +134,7 @@
         <camera_pose>-6 0 6 0 0.5 0</camera_pose>
       </plugin>
       <plugin filename="WorldControl" name="World control">
-        <ignition-gui>
+        <gz-gui>
           <title>World control</title>
           <property type="bool" key="showTitleBar">false</property>
           <property type="bool" key="resizable">false</property>
@@ -147,7 +147,7 @@
             <line own="left" target="left"/>
             <line own="bottom" target="bottom"/>
           </anchors>
-        </ignition-gui>
+        </gz-gui>
 
         <play_pause>true</play_pause>
         <step>true</step>
@@ -158,7 +158,7 @@
       </plugin>
 
       <plugin filename="WorldStats" name="World stats">
-        <ignition-gui>
+        <gz-gui>
           <title>World stats</title>
           <property type="bool" key="showTitleBar">false</property>
           <property type="bool" key="resizable">false</property>
@@ -171,7 +171,7 @@
             <line own="right" target="right"/>
             <line own="bottom" target="bottom"/>
           </anchors>
-        </ignition-gui>
+        </gz-gui>
 
         <sim_time>true</sim_time>
         <real_time>true</real_time>
@@ -182,9 +182,9 @@
 
       <!-- Entity tree -->
       <plugin filename="EntityTree" name="Entity tree">
-        <ignition-gui>
+        <gz-gui>
           <title>Entity tree</title>
-        </ignition-gui>
+        </gz-gui>
       </plugin>
 
       <!-- Transform Control -->

plugins/sim_gui/SimGui.hh

@@ -41,7 +41,7 @@ namespace gz
     ///   <plugin name="gz::launch::SimGui"
     ///           filename="gz-launch-simgui">
     ///
-    ///   <!-- Elements parsed by ign-launch -->
+    ///   <!-- Elements parsed by gz-launch -->
     ///
     ///   <!-- Set window title. Defaults to "Gazebo" -->
     ///   <window_title>Custom window title</window_title>

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))

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

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)

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;
 }
 
 /////////////////////////////////////////////////

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@

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");