Skip to content

Commit

Permalink
More aggressive migrations for ignition- and ign-
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jun 28, 2022
1 parent 23bc5b3 commit c2e5601
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/ci/after_make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -x
# Install
make install

# So ign-tools finds fuel-tools
# So gz-tools finds fuel-tools
export GZ_CONFIG_PATH=/usr/local/share/ignition
export LD_LIBRARY_PATH=/usr/local/lib/:$LD_LIBRARY_PATH

Expand Down
4 changes: 2 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

### Gazebo Fuel Tools 6.1.0 (2021-10-15)

1. Detect gz instead of using cmake module to check for ignition-tools
1. Detect gz instead of using cmake module to check for gz-tools
* [Pull request #191](https://github.com/gazebosim/gz-fuel-tools/pull/191)

1. Added fuel update command
Expand Down Expand Up @@ -83,7 +83,7 @@
1. APIs for retrieving models in parallel
* [Pull request #199](https://github.com/gazebosim/gz-fuel-tools/pull/199)

1. Detect `gz` instead of using cmake module to check for ignition-tools
1. Detect `gz` instead of using cmake module to check for gz-tools
* [Pull request #191](https://github.com/gazebosim/gz-fuel-tools/pull/191)

1. Added `gz fuel update` command
Expand Down
8 changes: 4 additions & 4 deletions configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ call %win_lib% :download_unzip_install curl-7.57.0-vc15-x64-dll-MD.zip
call %win_lib% :download_unzip_install jsoncpp-1.8.4-vc15-x64-dll-MD.zip
call %win_lib% :download_unzip_install libyaml-0.1.7-vc15-x64-md.zip
call %win_lib% :download_unzip_install libzip-1.4.0_zlip-1.2.11_vc15-x64-dll-MD.zip
call %win_lib% :install_ign_project ign-cmake gz-cmake3
call %win_lib% :install_ign_project ign-tools gz-tools2
call %win_lib% :install_ign_project ign-common main
call %win_lib% :install_ign_project ign-msgs main
call %win_lib% :install_ign_project gz-cmake gz-cmake3
call %win_lib% :install_ign_project gz-tools gz-tools2
call %win_lib% :install_ign_project gz-common main
call %win_lib% :install_ign_project gz-msgs main

:: Set configuration variables
@set build_type=Release
Expand Down
2 changes: 1 addition & 1 deletion src/Helpers_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ using namespace fuel_tools;
/////////////////////////////////////////////////
TEST(HelpersTEST, UriToPathNoAuthority)
{
// TO-DO: Update this test after ign-fuel-tools#204 is addressed
// TO-DO: Update this test after gz-fuel-tools#204 is addressed
#ifdef WIN32
const std::string testStr1 = R"(localhost:8000\some\path)";
const std::string testStr2 = R"(localhost:8000\some\path\)";
Expand Down
6 changes: 3 additions & 3 deletions src/LocalCache.cc
Original file line number Diff line number Diff line change
Expand Up @@ -603,9 +603,9 @@ void LocalCachePrivate::FixPathsInUri(tinyxml2::XMLElement *_elem,
// owner
gzdbg << "Model [" << _id.Name()
<< "] loading resource from another model, named [" << resourceName
<< "]. On Blueprint (ign-fuel-tools 3) and Citadel "
<< "(ign-fuel-tools 4), [" << resourceName << "] is ignored. "
<< "From Dome (ign-fuel-tools 5), [" << _id.Name()
<< "]. On Blueprint (gz-fuel-tools 3) and Citadel "
<< "(gz-fuel-tools 4), [" << resourceName << "] is ignored. "
<< "From Dome (gz-fuel-tools 5), [" << _id.Name()
<< "] will be used. If [" << resourceName
<< "] is not a model belonging to owner [" << _id.Owner()
<< "], fix your SDF file!" << std::endl;
Expand Down

0 comments on commit c2e5601

Please sign in to comment.