From 46ea90c4f9c7ab1f5ff0035f4eda933e7c3a8bdd Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 30 Aug 2018 22:33:14 -0700 Subject: [PATCH 1/3] Fix file existence logic in DartResourceRetriever --- dart/utils/DartResourceRetriever.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dart/utils/DartResourceRetriever.cpp b/dart/utils/DartResourceRetriever.cpp index 68e87d7f485b3..4019449dc30a9 100644 --- a/dart/utils/DartResourceRetriever.cpp +++ b/dart/utils/DartResourceRetriever.cpp @@ -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 { From 432e96a55553abc01c0d557182ab42a95f482621 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Mon, 3 Sep 2018 00:17:16 -0700 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30968882bcd9d..a7bba652a8433 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From f2ab7d6094a6549ecc0c21c05a5e7fe21f1fd802 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Mon, 3 Sep 2018 00:17:28 -0700 Subject: [PATCH 3/3] Bump version to 6.6.2 --- CMakeLists.txt | 2 +- package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d015408192b3a..8a93fc93bfcaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ endif() # If you change the version, please update the 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") diff --git a/package.xml b/package.xml index 18b59662df662..d5b93029f1ccf 100644 --- a/package.xml +++ b/package.xml @@ -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 --> dartsim - 6.6.1 + 6.6.2 DART (Dynamic Animation and Robotics Toolkit) is a collaborative, cross-platform, open source library created by the Georgia Tech Graphics