Convert ignitionrobotics to gazebosim in sources and includes (#1758)

Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org>
gazebosim · Oct 12, 2022 · 3276fbd · 3276fbd
1 parent ac5df7f
commit 3276fbd
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 28 deletions.
diff --git a/include/ignition/gazebo/Entity.hh b/include/ignition/gazebo/Entity.hh
@@ -21,8 +21,7 @@
 #include <ignition/gazebo/config.hh>
 #include <ignition/gazebo/Export.hh>
 
-/// \brief This library is part of the [Ignition
-/// Robotics](https://ignitionrobotics.org) project.
+/// \brief This library is part of the [Gazebo](https://gazebosim.org) project.
 namespace ignition
 {
   /// \brief Gazebo is a leading open source robotics simulator, that

diff --git a/include/ignition/gazebo/ServerConfig.hh b/include/ignition/gazebo/ServerConfig.hh
@@ -308,14 +308,14 @@ namespace ignition
               UpdatePeriod() const;
 
       /// \brief Path to where simulation resources, such as models downloaded
-      /// from fuel.ignitionrobotics.org, should be stored.
+      /// from fuel.gazebosim.org, should be stored.
       /// \return Path to a location on disk. An empty string indicates that
       /// the default value will be used, which is currently
       /// ~/.ignition/fuel.
       public: const std::string &ResourceCache() const;
 
       /// \brief Set the path to where simulation resources, such as models
-      /// downloaded from fuel.ignitionrobotics.org, should be stored.
+      /// downloaded from fuel.gazebosim.org, should be stored.
       /// \param[in] _path Path to a location on disk. An empty string
       /// indicates that the default value will be used, which is currently
       /// ~/.ignition/fuel.

diff --git a/src/SdfGenerator_TEST.cc b/src/SdfGenerator_TEST.cc
@@ -544,17 +544,17 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedNotExpanded)
 TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris)
 {
   const std::string goodUri =
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/2";
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/2";
 
   // These are URIs that are potentially problematic.
   const std::vector<std::string> fuelUris = {
       // Thes following two URIs are valid, but have a trailing '/'
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/",
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/2/",
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/",
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/2/",
       // Thes following two URIs are invalid, and will not be saved
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/"
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/"
       "notInt",
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack/"
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack/"
       "notInt/",
   };
 
@@ -609,7 +609,7 @@ TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithInvalidUris)
 TEST_F(ElementUpdateFixture, WorldWithModelsIncludedWithNonFuelUris)
 {
   const std::vector<std::string> includeUris = {
-      "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/models/Backpack",
+      "https://fuel.gazebosim.org/1.0/OpenRobotics/models/Backpack",
       std::string("file://") + PROJECT_SOURCE_PATH +
           "/test/worlds/models/sphere"};
 

diff --git a/src/ServerConfig.cc b/src/ServerConfig.cc
@@ -270,7 +270,7 @@ class ignition::gazebo::ServerConfigPrivate
   public: std::string logRecordCompressPath = "";
 
   /// \brief Path to where simulation resources, such as models downloaded
-  /// from fuel.ignitionrobotics.org, should be stored.
+  /// from fuel.gazebosim.org, should be stored.
   public: std::string resourceCache = "";
 
   /// \brief File containing physics engine plugin. If empty, DART will be used.

diff --git a/src/Server_TEST.cc b/src/Server_TEST.cc
@@ -1002,7 +1002,7 @@ TEST_P(ServerFixture, CachedFuelWorld)
 
   ServerConfig serverConfig;
   auto fuelWorldURL =
-    "https://fuel.ignitionrobotics.org/1.0/OpenRobotics/worlds/Test%20world";
+    "https://fuel.gazebosim.org/1.0/OpenRobotics/worlds/Test%20world";
   EXPECT_TRUE(serverConfig.SetSdfFile(fuelWorldURL));
 
   EXPECT_EQ(fuelWorldURL, serverConfig.SdfFile());

diff --git a/src/World.cc b/src/World.cc
@@ -110,7 +110,7 @@ Entity World::LightByName(const EntityComponentManager &_ecm,
     const std::string &_name) const
 {
   // Can't use components::Light in EntityByComponents, see
-  // https://github.com/ignitionrobotics/ign-gazebo/issues/376
+  // https://github.com/gazebosim/gz-sim/issues/376
   auto entities = _ecm.EntitiesByComponents(
       components::ParentEntity(this->dataPtr->id),
       components::Name(_name));
@@ -128,7 +128,7 @@ Entity World::ActorByName(const EntityComponentManager &_ecm,
     const std::string &_name) const
 {
   // Can't use components::Actor in EntityByComponents, see
-  // https://github.com/ignitionrobotics/ign-gazebo/issues/376
+  // https://github.com/gazebosim/gz-sim/issues/376
   auto entities = _ecm.EntitiesByComponents(
       components::ParentEntity(this->dataPtr->id),
       components::Name(_name));
@@ -155,7 +155,7 @@ Entity World::ModelByName(const EntityComponentManager &_ecm,
 std::vector<Entity> World::Lights(const EntityComponentManager &_ecm) const
 {
   // Can't use components::Light in EntityByComponents, see
-  // https://github.com/ignitionrobotics/ign-gazebo/issues/376
+  // https://github.com/gazebosim/gz-sim/issues/376
   auto entities = _ecm.EntitiesByComponents(
       components::ParentEntity(this->dataPtr->id));
 
@@ -172,7 +172,7 @@ std::vector<Entity> World::Lights(const EntityComponentManager &_ecm) const
 std::vector<Entity> World::Actors(const EntityComponentManager &_ecm) const
 {
   // Can't use components::Actor in EntityByComponents, see
-  // https://github.com/ignitionrobotics/ign-gazebo/issues/376
+  // https://github.com/gazebosim/gz-sim/issues/376
   auto entities = _ecm.EntitiesByComponents(
       components::ParentEntity(this->dataPtr->id));
 

diff --git a/src/cmd/cmdgazebo.rb.in b/src/cmd/cmdgazebo.rb.in
@@ -456,7 +456,7 @@ has properly set the DYLD_LIBRARY_PATH environment variables."
 
         if plugin.end_with? ".dylib"
           puts "`ign gazebo` currently only works with the -s argument on macOS.
-See https://github.com/ignitionrobotics/ign-gazebo/issues/44 for more info."
+See https://github.com/gazebosim/gz-sim/issues/44 for more info."
           exit(-1)
         end
 
@@ -511,7 +511,7 @@ See https://github.com/ignitionrobotics/ign-gazebo/issues/44 for more info."
       else options['gui']
         if plugin.end_with? ".dylib"
           puts "`ign gazebo` currently only works with the -s argument on macOS.
-See https://github.com/ignitionrobotics/ign-gazebo/issues/44 for more info."
+See https://github.com/gazebosim/gz-sim/issues/44 for more info."
           exit(-1)
         end
 

diff --git a/src/gui/AboutDialogHandler.cc b/src/gui/AboutDialogHandler.cc
@@ -35,9 +35,9 @@ AboutDialogHandler::AboutDialogHandler()
                    "<td style='padding-right: 10px;'>Documentation:"
                    "</td>"
                    "<td>"
-                     "<a href='https://ignitionrobotics.org/libs/gazebo' "
+                     "<a href='https://gazebosim.org/libs/sim' "
                      "style='text-decoration: none; color: #f58113'>"
-                       "https://ignitionrobotics.org/libs/gazebo"
+                       "https://gazebosim.org/libs/sim"
                      "</a>"
                    "</td>"
                  "</tr>"
@@ -46,9 +46,9 @@ AboutDialogHandler::AboutDialogHandler()
                      "Tutorials:"
                    "</td>"
                    "<td>"
-                     "<a href='https://ignitionrobotics.org/docs/' "
+                     "<a href='https://gazebosim.org/docs/' "
                      "style='text-decoration: none; color: #f58113'>"
-                       "https://ignitionrobotics.org/docs/"
+                       "https://gazebosim.org/docs/"
                      "</a>"
                    "</td>"
                  "</tr>"

diff --git a/src/gui/Gui_TEST.cc b/src/gui/Gui_TEST.cc
@@ -38,7 +38,7 @@ using namespace ignition;
 using namespace ignition::gazebo::gui;
 
 /////////////////////////////////////////////////
-// https://github.com/ignitionrobotics/ign-gazebo/issues/8
+// https://github.com/gazebosim/gz-sim/issues/8
 TEST(GuiTest, IGN_UTILS_TEST_DISABLED_ON_MAC(PathManager))
 {
   common::Console::SetVerbosity(4);

diff --git a/src/gui/plugins/scene3d/Scene3D.cc b/src/gui/plugins/scene3d/Scene3D.cc
@@ -2203,7 +2203,7 @@ void TextureNode::PrepareNode()
         newId, sz, QQuickWindow::TextureIsOpaque);
 #else
     // TODO(anyone) Use createTextureFromNativeObject
-    // https://github.com/ignitionrobotics/ign-gui/issues/113
+    // https://github.com/gazebosim/gz-gui/issues/113
 #ifndef _WIN32
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wdeprecated-declarations"

diff --git a/src/ign.hh b/src/ign.hh
@@ -78,7 +78,7 @@ extern "C" IGNITION_GAZEBO_VISIBLE int runGui(
 
 /// \brief External hook to find or download a fuel world provided a URL.
 /// \param[in] _pathToResource Path to the fuel world resource, ie,
-/// https://staging-fuel.ignitionrobotics.org/1.0/gmas/worlds/ShapesClone
+/// https://staging-fuel.gazebosim.org/1.0/gmas/worlds/ShapesClone
 /// \return C-string containing the path to the local world sdf file
 extern "C" IGNITION_GAZEBO_VISIBLE const char *findFuelResource(
     char *_pathToResource);

diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -37,6 +37,10 @@ static const std::string kIgnModelCommand(
 /////////////////////////////////////////////////
 std::string customExecStr(std::string _cmd)
 {
+  // Augment the system plugin path.
+  gz::common::setenv("IGN_GAZEBO_SYSTEM_PLUGIN_PATH",
+      gz::common::joinPaths(std::string(PROJECT_BINARY_PATH), "lib").c_str());
+
   _cmd += " 2>&1";
   FILE *pipe = popen(_cmd.c_str(), "r");
 

diff --git a/src/network/NetworkManagerPrimary.cc b/src/network/NetworkManagerPrimary.cc
@@ -212,7 +212,7 @@ bool NetworkManagerPrimary::SecondariesCanStep() const
   // TODO(anyone) Ideally we'd check the number of connections against the
   // number of expected secondaries, but there's no interface for that
   // on ign-transport yet:
-  // https://github.com/ignitionrobotics/ign-transport/issues/39
+  // https://github.com/gazebosim/gz-transport/issues/39
   return this->simStepPub.HasConnections();
 }
 

diff --git a/src/systems/ackermann_steering/AckermannSteering.hh b/src/systems/ackermann_steering/AckermannSteering.hh
@@ -111,7 +111,7 @@ namespace systems
   /// right_steering_joint
   ///
   /// References:
-  /// https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo4/src/systems/diff_drive
+  /// https://github.com/gazebosim/gz-sim/tree/ign-gazebo4/src/systems/diff_drive
   /// https://www.auto.tuwien.ac.at/bib/pdf_TR/TR0183.pdf
   /// https://github.com/froohoo/ackermansteer/blob/master/ackermansteer/
 

diff --git a/src/systems/battery_plugin/LinearBatteryPlugin.hh b/src/systems/battery_plugin/LinearBatteryPlugin.hh
@@ -57,7 +57,7 @@ namespace systems
   /// - `<charging_time>` Hours taken to fully charge the battery.
   ///                 (Required if `<enable_recharge>` is set to true)
   /// - `<fix_issue_225>` True to change the battery behavior to fix some issues
-  /// described in https://github.com/ignitionrobotics/ign-gazebo/issues/225.
+  /// described in https://github.com/gazebosim/gz-sim/issues/225.
   class LinearBatteryPlugin
       : public System,
         public ISystemConfigure,