Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix checking file existence in DartResourceRetriever #1107

Merged
merged 3 commits into from
Sep 3, 2018
Merged

Fix checking file existence in DartResourceRetriever #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46ea90c
Fix file existence logic in DartResourceRetriever
jslee02 Aug 31, 2018
432e96a
Update changelog
jslee02 Sep 3, 2018
f2ab7d6
Bump version to 6.6.2
jslee02 Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## DART 6

### [DART 6.6.2 (2018-09-03)](https://github.com/dartsim/dart/milestone/47?closed=1)

* Utils

* Fixed checking file existence in DartResourceRetriever: [#1107](https://github.com/dartsim/dart/pull/1107)

### [DART 6.6.1 (2018-08-04)](https://github.com/dartsim/dart/milestone/46?closed=1)

* Utils
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ endif()
# If you change the version, please update the <version> tag in package.xml.
set(DART_MAJOR_VERSION "6")
set(DART_MINOR_VERSION "6")
set(DART_PATCH_VERSION "1")
set(DART_PATCH_VERSION "2")
set(DART_VERSION "${DART_MAJOR_VERSION}.${DART_MINOR_VERSION}.${DART_PATCH_VERSION}")
set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.")
set(DART_PKG_EXTERNAL_DEPS "eigen, ccd, fcl, assimp, boost")
Expand Down
12 changes: 5 additions & 7 deletions dart/utils/DartResourceRetriever.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,13 @@ std::string DartResourceRetriever::getFilePath(const common::Uri& uri)

// path is empty if the file specified by fileUri doesn't exist.
if (!path.empty())
{
dtwarn << "Failed to retrieve a resource from '" << uri.toString()
<< "'. Please make sure you set the environment variable for "
<< "DART data path. For example:\n"
<< " $ export DART_DATA_PATH=/usr/local/share/doc/dart/data/\n";

return path;
}
}

dtwarn << "Failed to retrieve a resource from '" << uri.toString()
<< "'. Please make sure you set the environment variable for "
<< "DART data path. For example:\n"
<< " $ export DART_DATA_PATH=/usr/local/share/doc/dart/data/\n";
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
a Catkin workspace. Catkin is not required to build DART. For more
information, see: http://ros.org/reps/rep-0136.html -->
<name>dartsim</name>
<version>6.6.1</version>
<version>6.6.2</version>
<description>
DART (Dynamic Animation and Robotics Toolkit) is a collaborative,
cross-platform, open source library created by the Georgia Tech Graphics
Expand Down