Update references to systems to server

Signed-off-by: Michael Carroll <[email protected]>

Author: mjcarroll

include/ignition/gazebo/config.hh.in

@@ -14,7 +14,7 @@
 #define IGNITION_GAZEBO_VERSION_HEADER "Ignition Gazebo, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2018 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
 
 #define IGNITION_GAZEBO_GUI_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}/gui"
-#define IGNITION_GAZEBO_SYSTEM_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}/systems"
+#define IGNITION_GAZEBO_SERVER_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}/server.config"
 #define IGN_GAZEBO_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins"
 #define IGN_GAZEBO_GUI_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/gui"
 #define IGN_GAZEBO_WORLD_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}/worlds"

src/SimulationRunner.cc

@@ -160,24 +160,23 @@ SimulationRunner::SimulationRunner(const sdf::World *_world,
   // If we have reached this point and no systems have been loaded, then load
   // a default set of systems.
   // Order:
-  // 1. File at IGN_GAZEBO_DEFAULT_SYSTEMS
-  // 2. File at ${IGN_HOMEDIR}/.ignition/gazebo/systems.config
-  // 3. File at ${IGN_DATA_INSTALL_DIR}/systems/systems.config
+  // 1. File at IGN_GAZEBO_SERVER_CONFIG
+  // 2. File at ${IGN_HOMEDIR}/.ignition/gazebo/server.config
+  // 3. File at ${IGN_DATA_INSTALL_DIR}/server.config
 
   if (this->systems.empty() && this->pendingSystems.empty())
   {
     ignmsg << "No systems loaded, loading defaults" << std::endl;
 
     std::string envConfig;
-    ignition::common::env("IGN_GAZEBO_DEFAULT_SYSTEMS", envConfig);
+    ignition::common::env("IGN_GAZEBO_SERVER_CONFIG", envConfig);
 
     std::string defaultConfig;
     ignition::common::env(IGN_HOMEDIR, defaultConfig);
     defaultConfig = ignition::common::joinPaths(defaultConfig, ".ignition",
-      "gazebo", "systems.config");
+      "gazebo", "server.config");
 
-    auto installedConfig = ignition::common::joinPaths(
-        IGNITION_GAZEBO_SYSTEM_CONFIG_PATH, "systems.config");
+    auto installedConfig = IGNITION_GAZEBO_SERVER_CONFIG_PATH;
 
     std::string configPath;
     if (envConfig.size() && ignition::common::exists(envConfig))