Skip to content

Commit

Permalink
Bump main to 13.0.0~pre1
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina committed Oct 7, 2021
1 parent 1ffcca5 commit decfbaf
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:

env:
PACKAGE: sdformat12
PACKAGE: sdformat13
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ if(UNIX AND NOT WIN32)
endif(CMAKE_UNAME)
endif()

project (sdformat12)
project (sdformat13)

# The protocol version has nothing to do with the package version set below.
# It represents the current version of sdformat implement by the software
set (SDF_PROTOCOL_VERSION 1.9)

set (SDF_MAJOR_VERSION 12)
set (SDF_MAJOR_VERSION 13)
set (SDF_MINOR_VERSION 0)
set (SDF_PATCH_VERSION 0)

set (SDF_VERSION ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION})
set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION}~pre2)
set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION}~pre1)

string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string(REGEX REPLACE "[0-9]+" "" PROJECT_NAME_NO_VERSION ${PROJECT_NAME})
Expand Down
33 changes: 19 additions & 14 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,56 @@
## libsdformat 13.X

### libsdformat 13.0.0 (202X-XX-XX)


## libsdformat 12.X

### libsdformat 12.0.0 (202X-XX-XX)

1. Add API changes for PrintConfig
1. Add API changes for PrintConfig
* [Pull request #708](https://github.com/ignitionrobotics/sdformat/pull/708)

1. Add Force Torque Noise functions + Unit tests
1. Add Force Torque Noise functions + Unit tests
* [Pull request #669](https://github.com/ignitionrobotics/sdformat/pull/669)

1. Support quaternions representation for poses
1. Support quaternions representation for poses
* [Pull request #690](https://github.com/ignitionrobotics/sdformat/pull/690)

1. Support merge-include of nested models
1. Support merge-include of nested models
* [Pull request #659](https://github.com/ignitionrobotics/sdformat/pull/659)

1. Fix documentation on Euler angle convention in pose.sdf
1. Fix documentation on Euler angle convention in pose.sdf
* [Pull request #698](https://github.com/ignitionrobotics/sdformat/pull/698)
* [Pull request #702](https://github.com/ignitionrobotics/sdformat/pull/702)

1. Clarify documentation on //pose/@relative_to in the spec
1. Clarify documentation on //pose/@relative_to in the spec
* [Pull request #666](https://github.com/ignitionrobotics/sdformat/pull/666)

1. 🌐 Parse spherical coordinates
1. 🌐 Parse spherical coordinates
* [Pull request #685](https://github.com/ignitionrobotics/sdformat/pull/685)

1. Fix bug when using degrees in //include/pose
* [Pull request #697](https://github.com/ignitionrobotics/sdformat/pull/697)

1. Support rotation in degrees (#589)
1. Support rotation in degrees (#589)
* [Pull request #589](https://github.com/ignitionrobotics/sdformat/pull/589)

1. Add segmentation and bounding box sensor types
1. Add segmentation and bounding box sensor types
* [Pull request #592](https://github.com/ignitionrobotics/sdformat/pull/592)

1. Add support for custom sensors
1. Add support for custom sensors
* [Pull request #652](https://github.com/ignitionrobotics/sdformat/pull/652)

1. Remove deprecated functions and classes
1. Remove deprecated functions and classes
* [Pull request #622](https://github.com/ignitionrobotics/sdformat/pull/622)

1. Emit an error instead of a warning when a file has multiple root level
1. Emit an error instead of a warning when a file has multiple root level
* [Pull request #619](https://github.com/ignitionrobotics/sdformat/pull/619)

1. Copy spec 1.8 to 1.9
1. Copy spec 1.8 to 1.9
* [Pull request #568](https://github.com/ignitionrobotics/sdformat/pull/568)

1. Use encapsulated string constants for non-file sources
1. Use encapsulated string constants for non-file sources
* [Pull request #551](https://github.com/ignitionrobotics/sdformat/pull/551)

1. Forward ports
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ conda install libsdformat=9.3.0 --channel conda-forge
## Source Installation


**Note:** the `main` branch is under development for `libsdformat12` and is
currently unstable. A release branch (`sdf11`, `sdf10`, `sdf9`, etc.) is
recommended for most users.
**Note:** the `main` branch is under development for `libsdformat13` and is
currently unstable. A release branch (`sdf12`, `sdf11`, `sdf10`, `sdf9`, etc.)
is recommended for most users.

## UNIX

Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

find_package(sdformat12 REQUIRED)
find_package(sdformat13 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")

Expand Down

0 comments on commit decfbaf

Please sign in to comment.