Greedy ign- migrations

Signed-off-by: methylDragon <[email protected]>
gazebosim · Jul 12, 2022 · bebbd6c · bebbd6c
1 parent d7c1abd
commit bebbd6c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 gz_configure_project(
-  REPLACE_GZ_INCLUDE_PATH gz/launch
+  REPLACE_INCLUDE_PATH gz/launch
   VERSION_SUFFIX)
 
 #============================================================================

diff --git a/plugins/sim_gui/SimGui.hh b/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>

diff --git 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
@@ -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