\ No newline at end of file
+
diff --git a/doc/tutorials.in b/doc/tutorials.in
index 5171cfee..32cc685b 100644
--- a/doc/tutorials.in
+++ b/doc/tutorials.in
@@ -693,7 +693,7 @@ FILE_VERSION_FILTER =
# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
# tag is left empty.
-LAYOUT_FILE = "@IGNITION_CMAKE_DOXYGEN_DIR@/layout.xml"
+LAYOUT_FILE = "@GZ_CMAKE_DOXYGEN_DIR@/layout.xml"
# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
# the reference definitions. This must be a list of .bib files. The .bib
diff --git a/example/configure.bat b/example/configure.bat
deleted file mode 100644
index 655c5405..00000000
--- a/example/configure.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@rem Run CMake, pointing to sibling directories containing dependencies.
-@rem Note that zmq and cppzmq are relative to the source dir, while
-@rem protobuf is relative to the build dir. Not sure why.
-@set build_type=Release
-@if not "%1"=="" set build_type=%1
-@set build_bitness=64
-@if not "%2"=="" set build_bitness=%2
-@echo Configuring for build type %build_type%
-
-@set IGN_FUEL-TOOLS_PATH=%cd%\..\..\build\install\%build_type%
-
-cmake -G "NMake Makefiles"^
- -DCMAKE_PREFIX_PATH="%GZ_PATH%\lib\cmake\ignition-fuel-tools0;"^
- -DCMAKE_INSTALL_PREFIX="install"^
- -DCMAKE_BUILD_TYPE=%build_type%^
- ..
-
-@if %errorlevel% neq 0 exit /b %errorlevel%
-@echo Configuration complete. To build, run `nmake`
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 4b2bdd7b..992a1312 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,2 +1,2 @@
add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
+install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/include/gz/fuel_tools/Helpers.hh b/include/gz/fuel_tools/Helpers.hh
index b04e91c0..82989018 100644
--- a/include/gz/fuel_tools/Helpers.hh
+++ b/include/gz/fuel_tools/Helpers.hh
@@ -48,5 +48,5 @@ std::string uriToPath(const gz::common::URI &_uri);
}
}
-// IGNITION_FUEL_TOOLS_HELPERS_HH_
+// GZ_FUEL_TOOLS_HELPERS_HH_
#endif
diff --git a/include/gz/fuel_tools/config.hh.in b/include/gz/fuel_tools/config.hh.in
index 6b6183eb..74707ab8 100644
--- a/include/gz/fuel_tools/config.hh.in
+++ b/include/gz/fuel_tools/config.hh.in
@@ -30,6 +30,6 @@
#define GZ_FUEL_TOOLS_VERSION_HEADER "Gazebo Fuel Tools, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
-#define GZ_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/"
+#define GZ_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/"
#endif
diff --git a/src/FuelClient.cc b/src/FuelClient.cc
index a38a5670..0988c9f4 100644
--- a/src/FuelClient.cc
+++ b/src/FuelClient.cc
@@ -398,7 +398,7 @@ ModelIter FuelClient::Models(const ModelIdentifier &_id) const
return localIter;
// TODO(nkoenig) try to fetch model directly from a server
- // Note: ign-fuel-server doesn't like URLs ending in /
+ // Note: gz-fuel-server doesn't like URLs ending in /
common::URIPath path;
if (!_id.Name().empty() && !_id.Owner().empty())
path = path / _id.Owner() / "models" / _id.Name();
@@ -432,7 +432,7 @@ WorldIter FuelClient::Worlds(const WorldIdentifier &_id) const
gzmsg << _id.UniqueName() << " not found in cache, attempting download\n";
- // Note: ign-fuel-server doesn't like URLs ending in /
+ // Note: gz-fuel-server doesn't like URLs ending in /
common::URIPath path;
if (!_id.Name().empty())
path = path / _id.Owner() / "worlds" / _id.Name();
@@ -1699,7 +1699,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir,
_form.emplace("owner", _owner);
}
- // \todo(nkoenig) The ign-fuelserver expects an integer number for the
+ // \todo(nkoenig) The gz-fuelserver expects an integer number for the
// license information. The fuelserver should be modified to accept
// a string. Otherwise, we have to bake into each client a mapping of
// license name to integer.
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index e225e547..c546769a 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -2,17 +2,16 @@
# Note that the major version of the library is included in the name.
# Ex: cmdfuel0.rb
if (APPLE)
- set(IGN_LIBRARY_NAME lib${PROJECT_NAME_LOWER}.dylib)
+ set(GZ_LIBRARY_NAME lib${PROJECT_NAME_LOWER}.dylib)
elseif(MSVC)
- set(IGN_LIBRARY_NAME ${PROJECT_NAME_LOWER}.dll)
+ set(GZ_LIBRARY_NAME ${PROJECT_NAME_LOWER}.dll)
else()
- set(IGN_LIBRARY_NAME lib${PROJECT_NAME_LOWER}.so)
+ set(GZ_LIBRARY_NAME lib${PROJECT_NAME_LOWER}.so)
endif()
configure_file(
"cmdfuel.rb.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmdfuel${PROJECT_VERSION_MAJOR}.rb" @ONLY)
-
# Install the ruby command line library in an unversioned location.
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmdfuel${PROJECT_VERSION_MAJOR}.rb DESTINATION lib/ruby/gz)
diff --git a/src/cmd/cmdfuel.rb.in b/src/cmd/cmdfuel.rb.in
index 0be963e3..4dff63a4 100755
--- a/src/cmd/cmdfuel.rb.in
+++ b/src/cmd/cmdfuel.rb.in
@@ -28,7 +28,7 @@ end
require 'optparse'
# Constants.
-LIBRARY_NAME = '@IGN_LIBRARY_NAME@'
+LIBRARY_NAME = '@GZ_LIBRARY_NAME@'
LIBRARY_VERSION = '@PROJECT_VERSION_FULL@'
MAX_PARALLEL_JOBS = 16
@@ -76,7 +76,7 @@ COMMANDS = { 'fuel' =>
COMMON_OPTIONS + "\n\n" +
"Environment variables: \n"\
" GZ_FUEL_CACHE_PATH Path to the cache where resources are \n"\
- " downloaded to. Defaults to $HOME/.ignition/fuel \n"
+ " downloaded to. Defaults to $HOME/.gz/fuel \n"
}
SUBCOMMANDS = {
@@ -452,7 +452,7 @@ class Cmd
end
rescue
puts "Library error: Problem running [#{options['subcommand']}]() "\
- "from @IGN_LIBRARY_NAME@."
+ "from @GZ_LIBRARY_NAME@."
end # begin
end # execute
end # class
diff --git a/tutorials.md.in b/tutorials.md.in
index ee23ff8c..f1a11e23 100644
--- a/tutorials.md.in
+++ b/tutorials.md.in
@@ -1,8 +1,8 @@
\page tutorials Tutorials
-Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials
+Welcome to the Gazebo @GZ_DESIGNATION_CAP@ tutorials. These tutorials
will guide you through the process of understanding the capabilities of the
-Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
+Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively.
**The tutorials**
diff --git a/tutorials/01_installation.md b/tutorials/01_installation.md
index d555cf30..b4a97c3e 100644
--- a/tutorials/01_installation.md
+++ b/tutorials/01_installation.md
@@ -24,7 +24,7 @@ wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
Install Gazebo Fuel Tools:
```
sudo apt-get update
-sudo apt-get install libignition-fuel-tools<#>-dev
+sudo apt-get install libgz-fuel-tools<#>-dev
```
Be sure to replace `<#>` with a number value, such as 6 or 7, depending on
@@ -50,7 +50,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
Run the following commands:
```
brew tap osrf/simulation
-brew install ignition-fuel-tools<#>
+brew install gz-fuel-tools<#>
```
### Windows
@@ -67,7 +67,7 @@ conda activate gz-ws
Install:
```
-conda install libignition-fuel-tools<#> --channel conda-forge
+conda install libgz-fuel-tools<#> --channel conda-forge
```
Be sure to replace `<#>` with a number value, such as 1 or 2, depending on
@@ -84,20 +84,20 @@ Make sure you have removed the Ubuntu pre-compiled binaries before
installing from source:
```
-sudo apt-get remove libignition-fuel-tools<#>-dev
+sudo apt-get remove libgz-fuel-tools<#>-dev
```
Install prerequisites. A clean Ubuntu system will need:
```
-sudo apt-get install git cmake pkg-config python ruby-ronn libignition-cmake3-dev libignition-common5-dev libignition-math7-dev libignition-msgs9-dev libignition-tools2-dev libzip-dev libjsoncpp-dev libcurl4-openssl-dev libyaml-dev
+sudo apt-get install git cmake pkg-config python ruby-ronn libgz-cmake3-dev libgz-common5-dev libgz-math7-dev libgz-msgs9-dev libgz-tools2-dev libzip-dev libjsoncpp-dev libcurl4-openssl-dev libyaml-dev
```
Clone the repository into a directory and go into it:
```
-git clone https://github.com/gazebosim/gz-fuel-tools /tmp/ign-fuel-tools
-cd /tmp/ign-fuel-tools
+git clone https://github.com/gazebosim/gz-fuel-tools /tmp/gz-fuel-tools
+cd /tmp/gz-fuel-tools
```
Create a build directory and go there:
@@ -160,7 +160,7 @@ Debian-based install when you currently have installed the library from
source, navigate to your source code directory's build folders and run
`make uninstall`:
```
-cd /tmp/ign-fuel-tools/build
+cd /tmp/gz-fuel-tools/build
sudo make uninstall
```
@@ -212,12 +212,12 @@ Install Gazebo dependencies:
You can view available versions and their dependencies:
```
-conda search libignition-fuel-tools* --channel conda-forge --info
+conda search libgz-fuel-tools* --channel conda-forge --info
```
Install Gazebo dependencies, replacing `<#>` with the desired versions:
```
-conda install libignition-cmake<#> libignition-common<#> libignition-msgs<#> libignition-tools<#> --channel conda-forge
+conda install libgz-cmake<#> libgz-common<#> libgz-msgs<#> libgz-tools<#> --channel conda-forge
```
#### Building from source