Migrate more macros and test_config.h

Signed-off-by: methylDragon <[email protected]>
gazebosim · May 20, 2022 · 3a8c645 · 3a8c645
1 parent b1fd67a
commit 3a8c645
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ interacting with Ignition Fuel servers.
 
 See the [installation tutorial](https://ignitionrobotics.org/api/fuel_tools/5.0/install.html).
 
-Make sure `IGN_CONFIG_PATH` is set to the right install location so that `ign fuel` will work.
+Make sure `GZ_CONFIG_PATH` is set to the right install location so that `ign fuel` will work.
 Default is `/usr/local/share/ignition`.
 
 ## Examples
@@ -169,10 +169,10 @@ In the event that the installation is a mix of Debian and from source, command
 line tools from `ign-tools` may not work correctly.
 
 A workaround for a single package is to define the environment variable
-`IGN_CONFIG_PATH` to point to the location of the Ignition library installation,
+`GZ_CONFIG_PATH` to point to the location of the Ignition library installation,
 where the YAML file for the package is found, such as
 ```
-export IGN_CONFIG_PATH=/usr/local/share/ignition
+export GZ_CONFIG_PATH=/usr/local/share/ignition
 ```
 
 However, that environment variable only takes a single path, which means if the
@@ -187,7 +187,7 @@ ln -s /usr/local/share/ignition/fuel4.yaml .
 ln -s /usr/local/share/ignition/transport7.yaml .
 ln -s /usr/local/share/ignition/transportlog7.yaml .
 ...
-export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
+export GZ_CONFIG_PATH=$HOME/.ignition/tools/configs
 ```
 
 This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issues/8).
diff --git a/example/configure.bat b/example/configure.bat
@@ -10,7 +10,7 @@
 @set IGN_FUEL-TOOLS_PATH=%cd%\..\..\build\install\%build_type%
 
 cmake -G "NMake Makefiles"^
-      -DCMAKE_PREFIX_PATH="%IGN_PATH_PATH%\lib\cmake\ignition-fuel-tools0;"^
+      -DCMAKE_PREFIX_PATH="%GZ_PATH%\lib\cmake\ignition-fuel-tools0;"^
       -DCMAKE_INSTALL_PREFIX="install"^
       -DCMAKE_BUILD_TYPE=%build_type%^
       ..

diff --git a/src/ClientConfig.cc b/src/ClientConfig.cc
@@ -53,7 +53,7 @@ class gz::fuel_tools::ClientConfigPrivate
             this->cacheLocation = "";
             this->configPath = "";
             this->userAgent =
-              "IgnitionFuelTools-" IGNITION_FUEL_TOOLS_VERSION_FULL;
+              "IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL;
           }
 
   /// \brief A list of servers.
@@ -67,7 +67,7 @@ class gz::fuel_tools::ClientConfigPrivate
 
   /// \brief Name of the user agent.
   public: std::string userAgent =
-          "IgnitionFuelTools-" IGNITION_FUEL_TOOLS_VERSION_FULL;
+          "IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL;
 };
 
 //////////////////////////////////////////////////

diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc
@@ -278,7 +278,7 @@ TEST(ClientConfig, EmptyCachePathConfiguration)
 TEST(ClientConfig, UserAgent)
 {
   ClientConfig config;
-  EXPECT_EQ("IgnitionFuelTools-" IGNITION_FUEL_TOOLS_VERSION_FULL,
+  EXPECT_EQ("IgnitionFuelTools-" GZ_FUEL_TOOLS_VERSION_FULL,
             config.UserAgent());
 
   config.SetUserAgent("my_user_agent");

diff --git a/src/ign.cc b/src/ign.cc
@@ -287,7 +287,7 @@ extern "C" bool getOwnerWorlds(
 //////////////////////////////////////////////////
 extern "C" GZ_FUEL_TOOLS_VISIBLE char *ignitionVersion()
 {
-  return strdup(IGNITION_FUEL_TOOLS_VERSION_FULL);
+  return strdup(GZ_FUEL_TOOLS_VERSION_FULL);
 }
 
 //////////////////////////////////////////////////
@@ -324,7 +324,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int listModels(const char *_url,
     conf.AddServer(serverConf);
   }
 
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
 
   // Filter
   gz::fuel_tools::ModelIdentifier modelId;
@@ -414,7 +414,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int listWorlds(const char *_url,
     conf.AddServer(serverConf);
   }
 
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
 
   // Filter
   gz::fuel_tools::WorldIdentifier worldId;
@@ -499,7 +499,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int downloadUrl(const char *_url,
     conf.LoadConfig(_configFile);
   }
 
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
 
   gz::fuel_tools::FuelClient client(conf);
   gz::fuel_tools::ModelIdentifier model;
@@ -673,7 +673,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int upload(const char *_path,
   });
 
   gz::fuel_tools::ClientConfig conf;
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
   gz::fuel_tools::FuelClient client(conf);
   gz::fuel_tools::ModelIdentifier model;
 
@@ -741,7 +741,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int deleteUrl(
     const char *_url, const char *_header)
 {
   gz::fuel_tools::ClientConfig conf;
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
   gz::fuel_tools::FuelClient client(conf);
 
   // Store header information
@@ -828,7 +828,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int editUrl(
     const char *_path)
 {
   gz::fuel_tools::ClientConfig conf;
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
   gz::fuel_tools::FuelClient client(conf);
 
   // Store header information
@@ -928,7 +928,7 @@ extern "C" GZ_FUEL_TOOLS_VISIBLE int update(
   // Client
   gz::fuel_tools::ClientConfig conf;
 
-  conf.SetUserAgent("FuelTools " IGNITION_FUEL_TOOLS_VERSION_FULL);
+  conf.SetUserAgent("FuelTools " GZ_FUEL_TOOLS_VERSION_FULL);
 
   gz::fuel_tools::FuelClient client(conf);
 

diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -47,7 +47,7 @@ std::string custom_exec_str(std::string _cmd)
   return result;
 }
 
-auto g_version = std::string(strdup(IGNITION_FUEL_TOOLS_VERSION_FULL));
+auto g_version = std::string(strdup(GZ_FUEL_TOOLS_VERSION_FULL));
 
 auto g_listCmd = "ign fuel list -v 4 --force-version " + g_version;
 

diff --git a/test/test_config.h.in b/test/test_config.h.in
@@ -20,8 +20,8 @@
 
 #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}"
 #define PROJECT_BINARY_PATH "${PROJECT_BINARY_DIR}"
-#define IGNITION_FUEL_TOOLS_LIBRARY_PATH "${PROJECT_BINARY_DIR}/src"
-#define IGNITION_FUEL_TOOLS_VERSION_FULL "@PROJECT_VERSION_FULL@"
+#define GZ_FUEL_TOOLS_LIBRARY_PATH "${PROJECT_BINARY_DIR}/src"
+#define GZ_FUEL_TOOLS_VERSION_FULL "@PROJECT_VERSION_FULL@"
 #define TEST_PATH "${PROJECT_SOURCE_DIR}/test"
 
 #include <climits>