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

Cherry-pick from sdf9 to sdf10 #372

Merged
merged 4 commits into from
Sep 10, 2020
Merged

Cherry-pick from sdf9 to sdf10 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6faec2
SearchForStuff: add logic to find urdfdom without pkg-config (#245)
traversaro Sep 7, 2020
d2eb610
Changelog for 9.3.0 release (#368)
scpeters Sep 7, 2020
471ffb0
Define PATH_MAX for Debian Hurd system (#369)
j-rivero Sep 9, 2020
e190b60
Changelog for 8.9.0 (#361)
chapulina Sep 8, 2020
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
24 changes: 23 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@

### SDFormat 9.3.0 (2020-XX-XX)

1. Store material file path information.
+ [Pull request 349](https://github.com/osrf/sdformat/pull/349)

1. Support nested models in DOM and frame semantics.
* [Pull request 316](https://github.com/osrf/sdformat/pull/316)
+ [Pull request 341](https://github.com/osrf/sdformat/pull/341)
Expand All @@ -42,12 +45,19 @@
1. Fix Actor copy operators and increase test coverage.
* [Pull request 301](https://github.com/osrf/sdformat/pull/301)

1. GitHub Actions CI, pull request labels.
* [Pull request 311](https://github.com/osrf/sdformat/pull/311)
* [Pull request 363](https://github.com/osrf/sdformat/pull/363)

1. Change bitbucket links to GitHub.
* [Pull request 240](https://github.com/osrf/sdformat/pull/240)

1. Param_TEST: test parsing +Inf and -Inf.
1. Param\_TEST: test parsing +Inf and -Inf.
* [Pull request 277](https://github.com/osrf/sdformat/pull/277)

1. SearchForStuff: add logic to find urdfdom without pkg-config.
* [Pull request 245](https://github.com/osrf/sdformat/pull/245)

1. Observe the CMake variable `BUILD_TESTING` if it is defined.
* [Pull request 269](https://github.com/osrf/sdformat/pull/269)

Expand Down Expand Up @@ -251,9 +261,21 @@

### libsdformat 8.X.X (202X-XX-XX)

### SDFormat 8.9.0 (2020-09-04)

1. Find python3 in cmake, fix warning
* [Pull request 328](https://github.com/osrf/sdformat/pull/328)

1. Store material file path information
* [Pull request 349](https://github.com/osrf/sdformat/pull/349)

1. Fix Actor copy operators and increase test coverage.
* [Pull request 301](https://github.com/osrf/sdformat/pull/301)

1. Migration to GitHub: CI, links...
* [Pull request 239](https://github.com/osrf/sdformat/pull/239)
* [Pull request 310](https://github.com/osrf/sdformat/pull/310)

1. Increase output precision of URDF to SDF conversion, output -0 as 0.
* [BitBucket pull request 675](https://osrf-migration.github.io/sdformat-gh-pages/#!/osrf/sdformat/pull-requests/675)

Expand Down
8 changes: 7 additions & 1 deletion cmake/SearchForStuff.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
pkg_check_modules(URDF urdfdom>=1.0)

if (NOT URDF_FOUND)
if (NOT DEFINED USE_INTERNAL_URDF)
find_package(urdfdom)
if (urdfdom_FOUND)
set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS})
# ${urdfdom_LIBRARIES} already contains absolute library filenames
set(URDF_LIBRARY_DIRS "")
set(URDF_LIBRARIES ${urdfdom_LIBRARIES})
elseif (NOT DEFINED USE_INTERNAL_URDF)
message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy")
set(USE_INTERNAL_URDF true)
else()
Expand Down
5 changes: 5 additions & 0 deletions src/Filesystem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@

#include "sdf/Filesystem.hh"

/* PATH_MAX is undefined on GNU Hurd */
#ifndef PATH_MAX
#define PATH_MAX 4096
#endif

namespace sdf
{
inline namespace SDF_VERSION_NAMESPACE {
Expand Down
5 changes: 5 additions & 0 deletions src/Filesystem_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
#include <sys/types.h>
#include <unistd.h>

/* PATH_MAX is undefined on GNU Hurd */
#ifndef PATH_MAX
#define PATH_MAX 4096
#endif

/////////////////////////////////////////////////
bool create_and_switch_to_temp_dir(std::string &_new_temp_path)
{
Expand Down