Fix more broken references

Signed-off-by: methylDragon <[email protected]>

CMakeLists.txt

@@ -201,10 +201,10 @@ else()
 	endif()
 endif()
 # Plugin install dirs
-set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR
+set(GZ_SIM_PLUGIN_INSTALL_DIR
   ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins
 )
-set(IGNITION_GAZEBO_GUI_PLUGIN_INSTALL_DIR
+set(GZ_SIM_GUI_PLUGIN_INSTALL_DIR
   ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/gui
 )
 

Changelog.md

@@ -2699,7 +2699,7 @@
 
 ### Gazebo 2.18.0 (2020-05-20)
 
-1. Added a `/world/<world_name>/create_multiple` service that parallels the current `/world/<world_name>/create` service. The `create_multiple` service can handle an `ignition::msgs::EntityFactory_V` message that may contain one or more entities to spawn.
+1. Added a `/world/<world_name>/create_multiple` service that parallels the current `/world/<world_name>/create` service. The `create_multiple` service can handle an `gz::msgs::EntityFactory_V` message that may contain one or more entities to spawn.
     * [Pull Request 146](https://github.com/gazebosim/gz-sim/pull/146)
 
 1. DetachableJoint system: Add option to suppress warning about missing child model
@@ -3116,7 +3116,7 @@
 1. Update Camera and DepthCamera components to use sdf::Sensor object instead of an sdf::ElementPtr.
     * [BitBucket pull request 299](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-sim/pull-requests/299)
 
-1. Added system for ignition::sensors::AirPressureSensor.
+1. Added system for gz::sensors::AirPressureSensor.
     * [BitBucket pull request 300](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-sim/pull-requests/300)
 
 1. Support conversion and serialization of Imu components. IMU sensors are

Migration.md

@@ -96,7 +96,7 @@ since pose information is being logged in the `changed_state` topic.
 
 * Use `cli` component of `ignition-utils1`.
 
-* `ignition::sim::RenderUtil::SelectedEntities()` now returns a
+* `gz::sim::RenderUtil::SelectedEntities()` now returns a
   `const std::vector<Entity> &` instead of forcing a copy. The calling code
   should create a copy if it needs to modify the vector in some way.
 
@@ -109,14 +109,14 @@ since pose information is being logged in the `changed_state` topic.
 
 * Various `GuiEvent`s were deprecated in favor of their Gazebo GUI
   equivalents.
-  * **Deprecated** `ignition::sim::gui::SnapIntervals`
-  * **Replacement** `ignition::gui::SnapIntervals`
-  * **Deprecated** `ignition::sim::gui::Render`
-  * **Replacement** `ignition::gui::Render`
-  * **Deprecated** `ignition::sim::gui::SpawnPreviewModel`
-  * **Replacement** `ignition::gui::SpawnFromDescription`
-  * **Deprecated** `ignition::sim::gui::SnapPreviewPath`
-  * **Replacement** `ignition::gui::SnapFromPath`
+  * **Deprecated** `gz::sim::gui::SnapIntervals`
+  * **Replacement** `gz::gui::SnapIntervals`
+  * **Deprecated** `gz::sim::gui::Render`
+  * **Replacement** `gz::gui::Render`
+  * **Deprecated** `gz::sim::gui::SpawnPreviewModel`
+  * **Replacement** `gz::gui::SpawnFromDescription`
+  * **Deprecated** `gz::sim::gui::SnapPreviewPath`
+  * **Replacement** `gz::gui::SnapFromPath`
 
 * The `<direction>` tag of spot lights was previously not parsed by the
   scene, so all spot lights shone in the direction corresponding to the

src/CMakeLists.txt

@@ -166,7 +166,7 @@ add_dependencies(${PROJECT_LIBRARY_TARGET_NAME}
   gz-sim_private_msgs
 )
 
-set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR
+set(GZ_SIM_PLUGIN_INSTALL_DIR
   ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins
 )
 

src/ServerPrivate.cc

@@ -40,8 +40,8 @@ struct LoggingPlugin
   public: static std::string &LoggingPluginFileName()
   {
     static std::string recordPluginFileName =
-      std::string("ignition-gazebo") +
-      IGNITION_GAZEBO_MAJOR_VERSION_STR + "-log-system";
+      std::string("gz-sim") +
+      GZ_SIM_MAJOR_VERSION_STR + "-log-system";
     return recordPluginFileName;
   }
 

src/SystemLoader.cc

@@ -55,7 +55,7 @@ class gz::sim::SystemLoaderPrivate
     std::string homePath;
     gz::common::env(IGN_HOMEDIR, homePath);
     systemPaths.AddPluginPaths(homePath + "/.gz/sim/plugins");
-    systemPaths.AddPluginPaths(IGN_GAZEBO_PLUGIN_INSTALL_DIR);
+    systemPaths.AddPluginPaths(GZ_SIM_PLUGIN_INSTALL_DIR);
 
     auto pathToLib = systemPaths.FindSharedLibrary(_filename);
     if (pathToLib.empty())

src/SystemLoader_TEST.cc

@@ -42,7 +42,7 @@ TEST(SystemLoader, Constructor)
   root.LoadSdfString(std::string("<?xml version='1.0'?><sdf version='1.6'>"
       "<world name='default'>"
       "<plugin filename='libignition-gazebo") +
-      IGNITION_GAZEBO_MAJOR_VERSION_STR + "-physics-system.so' "
+      GZ_SIM_MAJOR_VERSION_STR + "-physics-system.so' "
       "name='gz::sim::systems::Physics'></plugin>"
       "</world></sdf>");
 

src/Util.cc

@@ -622,7 +622,7 @@ std::string resolveSdfWorldFile(const std::string &_sdfFile,
     systemPaths.SetFilePathEnv(kResourcePathEnv);
 
     // Worlds installed with ign-gazebo
-    systemPaths.AddFilePaths(IGN_GAZEBO_WORLD_INSTALL_DIR);
+    systemPaths.AddFilePaths(GZ_SIM_WORLD_INSTALL_DIR);
 
     filePath = systemPaths.FindFile(_sdfFile);
   }

src/cmd/ign.cc

@@ -33,13 +33,13 @@
 //////////////////////////////////////////////////
 extern "C" char *ignitionGazeboVersion()
 {
-  return strdup(GZ_GAZEBO_VERSION_FULL);
+  return strdup(GZ_SIM_VERSION_FULL);
 }
 
 //////////////////////////////////////////////////
 extern "C" char *gazeboVersionHeader()
 {
-  return strdup(IGNITION_GAZEBO_VERSION_HEADER);
+  return strdup(GZ_SIM_VERSION_HEADER);
 }
 
 //////////////////////////////////////////////////
@@ -52,7 +52,7 @@ extern "C" void cmdVerbosity(
 //////////////////////////////////////////////////
 extern "C" const char *worldInstallDir()
 {
-  return IGN_GAZEBO_WORLD_INSTALL_DIR;
+  return GZ_SIM_WORLD_INSTALL_DIR;
 }
 
 //////////////////////////////////////////////////
@@ -145,7 +145,7 @@ extern "C" int runServer(const char *_sdfString,
 
   serverConfig.SetLogRecordPath(recordPathMod);
 
-  ignmsg << "Ignition Gazebo Server v" << GZ_GAZEBO_VERSION_FULL
+  ignmsg << "Ignition Gazebo Server v" << GZ_SIM_VERSION_FULL
          << std::endl;
 
   // Set the SDF string to user
@@ -214,24 +214,24 @@ extern "C" int runGui(const char *_guiConfig)
     sigKilled = true;
   });
 
-  ignmsg << "Ignition Gazebo GUI    v" << GZ_GAZEBO_VERSION_FULL
+  ignmsg << "Ignition Gazebo GUI    v" << GZ_SIM_VERSION_FULL
          << std::endl;
 
   int argc = 0;
   char **argv = nullptr;
 
   // Initialize Qt app
   gz::gui::Application app(argc, argv);
-  app.AddPluginPath(IGN_GAZEBO_GUI_PLUGIN_INSTALL_DIR);
+  app.AddPluginPath(GZ_SIM_WORLD_INSTALL_DIR;;
 
   // add import path so we can load custom modules
-  app.Engine()->addImportPath(IGN_GAZEBO_GUI_PLUGIN_INSTALL_DIR);
+  app.Engine()->addImportPath(GZ_SIM_WORLD_INSTALL_DIR;;
 
   // Set default config file for Gazebo
   std::string defaultConfigDir;
   gz::common::env(IGN_HOMEDIR, defaultConfigDir);
   defaultConfigDir = gz::common::joinPaths(defaultConfig, ".gz",
-      "sim", IGNITION_GAZEBO_MAJOR_VERSION_STR);
+      "sim", GZ_SIM_MAJOR_VERSION_STR);
 
   auto defaultConfig = gz::common::joinPaths(defaultConfigDir,
       "gui.config");
@@ -406,7 +406,7 @@ extern "C" int runGui(const char *_guiConfig)
     if (!gz::common::exists(defaultConfig))
     {
       auto installedConfig = gz::common::joinPaths(
-          IGNITION_GAZEBO_GUI_CONFIG_PATH, "gui.config");
+          GZ_SIM_GUI_CONFIG_PATH, "gui.config");
 
       if (!gz::common::createDirectories(defaultConfigDir))
       {

src/gui/AboutDialogHandler.cc

@@ -28,7 +28,7 @@ using namespace sim::gui;
 /////////////////////////////////////////////////
 AboutDialogHandler::AboutDialogHandler()
 {
-  aboutText += std::string(IGNITION_GAZEBO_VERSION_HEADER);
+  aboutText += std::string(GZ_SIM_VERSION_HEADER);
   aboutText += "<table class='nostyle'>"
                  "<tr>"
                    "<td style='padding-right: 10px;'>Documentation:"

src/gui/Gui.cc

@@ -52,7 +52,7 @@ std::unique_ptr<gz::gui::Application> createGui(
     sigKilled = true;
   });
 
-  ignmsg << "Gazebo GUI    v" << GZ_GAZEBO_VERSION_FULL
+  ignmsg << "Gazebo GUI    v" << GZ_SIM_VERSION_FULL
          << std::endl;
 
   // Set auto scaling factor for HiDPI displays
@@ -63,7 +63,7 @@ std::unique_ptr<gz::gui::Application> createGui(
 
   // Initialize Qt app
   auto app = std::make_unique<gz::gui::Application>(_argc, _argv);
-  app->AddPluginPath(IGN_GAZEBO_GUI_PLUGIN_INSTALL_DIR);
+  app->AddPluginPath(GZ_SIM_GUI_PLUGIN_INSTALL_DIR);
 
   auto aboutDialogHandler = new gz::sim::gui::AboutDialogHandler();
   aboutDialogHandler->setParent(app->Engine());
@@ -75,7 +75,7 @@ std::unique_ptr<gz::gui::Application> createGui(
   pathManager->setParent(app->Engine());
 
   // add import path so we can load custom modules
-  app->Engine()->addImportPath(IGN_GAZEBO_GUI_PLUGIN_INSTALL_DIR);
+  app->Engine()->addImportPath(GZ_SIM_GUI_PLUGIN_INSTALL_DIR);
   std::string defaultGuiConfigName = "gui.config";
 
   // Set default config file for Gazebo
@@ -280,7 +280,7 @@ std::unique_ptr<gz::gui::Application> createGui(
       }
 
       auto installedConfig = gz::common::joinPaths(
-          IGNITION_GAZEBO_GUI_CONFIG_PATH, defaultGuiConfigName);
+          GZ_SIM_GUI_CONFIG_PATH, defaultGuiConfigName);
       if (!gz::common::exists(installedConfig))
       {
         ignerr << "Failed to copy installed config [" << installedConfig

src/gui/plugins/CMakeLists.txt

@@ -112,7 +112,7 @@ function(gz_add_gui_plugin plugin_name)
     endif()
   endif()
 
-  install (TARGETS ${plugin_name} DESTINATION ${IGNITION_GAZEBO_GUI_PLUGIN_INSTALL_DIR})
+  install (TARGETS ${plugin_name} DESTINATION ${GZ_SIM_GUI_PLUGIN_INSTALL_DIR})
 endfunction()
 
 add_subdirectory(modules)

src/gui/plugins/modules/CMakeLists.txt

@@ -7,6 +7,6 @@ gz_add_gui_library(EntityContextMenu
   QT_HEADERS EntityContextMenu.hh
 )
 
-install (TARGETS EntityContextMenu DESTINATION ${IGNITION_GAZEBO_GUI_PLUGIN_INSTALL_DIR}/${module_name})
-install (FILES qmldir DESTINATION ${IGNITION_GAZEBO_GUI_PLUGIN_INSTALL_DIR}/${module_name})
+install (TARGETS EntityContextMenu DESTINATION ${GZ_SIM_GUI_PLUGIN_INSTALL_DIR}/${module_name})
+install (FILES qmldir DESTINATION ${GZ_SIM_GUI_PLUGIN_INSTALL_DIR}/${module_name})
 

src/ign.cc

@@ -43,7 +43,7 @@ extern "C" char *ignitionGazeboVersion()
 //////////////////////////////////////////////////
 extern "C" char *gazeboVersionHeader()
 {
-  return strdup(IGNITION_GAZEBO_VERSION_HEADER);
+  return strdup(GZ_SIM_VERSION_HEADER);
 }
 
 //////////////////////////////////////////////////
@@ -56,7 +56,7 @@ extern "C" void cmdVerbosity(
 //////////////////////////////////////////////////
 extern "C" const char *worldInstallDir()
 {
-  return IGN_GAZEBO_WORLD_INSTALL_DIR;
+  return GZ_SIM_WORLD_INSTALL_DIR;
 }
 
 //////////////////////////////////////////////////

src/systems/CMakeLists.txt

@@ -73,7 +73,7 @@ function(gz_add_system system_name)
   endif()
 
   # Note that plugins are currently being installed in 2 places. /lib and the plugin dir
-  install(TARGETS ${system_target} DESTINATION ${IGNITION_GAZEBO_PLUGIN_INSTALL_DIR})
+  install(TARGETS ${system_target} DESTINATION ${GZ_SIM_PLUGIN_INSTALL_DIR})
 
   # The library created by `ign_add_component` includes the ign-gazebo version
   # (i.e. libignition-gazebo1-name-system.so), but for portability of SDF
@@ -89,7 +89,7 @@ function(gz_add_system system_name)
   else()
     file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
     EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-    INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/${unversioned} DESTINATION ${IGNITION_GAZEBO_PLUGIN_INSTALL_DIR})
+    INSTALL(FILES ${PROJECT_BINARY_DIR}/lib/${unversioned} DESTINATION ${GZ_SIM_PLUGIN_INSTALL_DIR})
   endif()
 endfunction()
 

src/systems/physics/EntityFeatureMap_TEST.cc

@@ -57,7 +57,7 @@ class EntityFeatureMapFixture: public InternalFixture<::testing::Test>
     const std::string pluginLib = "libignition-physics-dartsim-plugin.so";
 
     common::SystemPaths systemPaths;
-    systemPaths.AddPluginPaths({IGNITION_PHYSICS_ENGINE_INSTALL_DIR});
+    systemPaths.AddPluginPaths({GZ_PHYSICS_ENGINE_INSTALL_DIR});
 
     auto pathToLib = systemPaths.FindSharedLibrary(pluginLib);
     ASSERT_FALSE(pathToLib.empty())

src/systems/physics/Physics.cc

@@ -773,7 +773,7 @@ void Physics::Configure(const Entity &_entity,
   // * Engines installed with ign-physics
   common::SystemPaths systemPaths;
   systemPaths.SetPluginPathEnv(this->dataPtr->pluginPathEnv);
-  systemPaths.AddPluginPaths({IGNITION_PHYSICS_ENGINE_INSTALL_DIR});
+  systemPaths.AddPluginPaths({GZ_PHYSICS_ENGINE_INSTALL_DIR});
 
   auto pathToLib = systemPaths.FindSharedLibrary(pluginLib);
   if (pathToLib.empty())

test/integration/examples_build.cc

@@ -90,11 +90,11 @@ std::vector<ExampleEntry> GetExamples()
       common::joinPaths(PROJECT_SOURCE_PATH, "/examples/", type);
 
     // Iterate over directory
-    ignition::common::DirIter endIter;
-    for (ignition::common::DirIter dirIter(examplesDir);
+    gz::common::DirIter endIter;
+    for (gz::common::DirIter dirIter(examplesDir);
         dirIter != endIter; ++dirIter)
     {
-      auto base = ignition::common::basename(*dirIter);
+      auto base = gz::common::basename(*dirIter);
       auto sourceDir = common::joinPaths(examplesDir, base);
       examples.push_back({ type, base, sourceDir });
     }
@@ -122,7 +122,7 @@ void ExamplesBuild::Build(const ExampleEntry &_entry)
   }
 
   // Path to examples of the given type
-  ASSERT_TRUE(ignition::common::exists(_entry.sourceDir));
+  ASSERT_TRUE(gz::common::exists(_entry.sourceDir));
 
   igndbg << "Source: " << _entry.sourceDir << std::endl;
 

test/integration/tracked_vehicle_system.cc

@@ -83,7 +83,7 @@ class TrackedVehicleTest : public InternalFixture<::testing::Test>
     // modifications)
     common::SystemPaths systemPaths;
     systemPaths.SetPluginPathEnv("GZ_SIM_PHYSICS_ENGINE_PATH");
-    systemPaths.AddPluginPaths({IGNITION_PHYSICS_ENGINE_INSTALL_DIR});
+    systemPaths.AddPluginPaths({GZ_PHYSICS_ENGINE_INSTALL_DIR});
 
     auto pathToLib = systemPaths.FindSharedLibrary(*pluginLib);
     ASSERT_FALSE(pathToLib.empty())

test/test_config.hh.in

@@ -49,12 +49,12 @@ struct TestWorldSansPhysics
     "<sdf version='1.6'>"
       "<world name='default'>"
         "<plugin filename='libignition-gazebo") +
-        GZ_GAZEBO_MAJOR_VERSION_STR + "-scene-broadcaster-system.so'"
+        GZ_SIM_MAJOR_VERSION_STR + "-scene-broadcaster-system.so'"
         "  name='gz::sim::systems::SceneBroadcaster'>"
         "</plugin>"
         "<plugin"
         "  filename='libignition-gazebo" +
-        GZ_GAZEBO_MAJOR_VERSION_STR + "-user-commands-system.so'"
+        GZ_SIM_MAJOR_VERSION_STR + "-user-commands-system.so'"
         "  name='gz::sim::systems::UserCommands'>"
         "</plugin>"
       "</world>"