Skip to content

Merge sdf11 to sdf12#810

Merged
scpeters merged 21 commits intogazebosim:sdf12from
scpeters:merge_11_to_12
Dec 30, 2021
Merged

Merge sdf11 to sdf12#810
scpeters merged 21 commits intogazebosim:sdf12from
scpeters:merge_11_to_12

Conversation

@scpeters
Copy link
Copy Markdown
Member

➡️ Forward port

Port sdf11 to sdf12

Branch comparison: sdf12...sdf11

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

iche033 and others added 20 commits November 8, 2021 12:00
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
* Fix cmake warning about newlines
* Find python3 in cmake, fix warning (gazebosim#328)

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Adds a sentence to the behavior of //model/static to avoid confusion on what might happen if it is used within a model that is itself included in another model. Also adds some clarification to //model/@canonical_link.

Signed-off-by: FirefoxMetzger <sebastian@wallkoetter.net>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
This replaces most of the custom cmake code in
libsdformat with the functionality provided by
ignition-cmake2. The root CMakeLists.txt is much shorter
now and most of the cmake folder has been deleted.
This is made possible by the NO_IGNITION_PREFIX
and REPLACE_IGNITION_INCLUDE_PATH parameters
added to ign_configure_project in ign-cmake#190 and
ign-cmake#191. Closes gazebosim#181. Other details:

* Use FindIgnURDFDOM from ign-cmake#193
* Use HIDE_SYMBOLS_BY_DEFAULT from ign-cmake#196
* Set LEGACY_PROJECT_PREFIX from ign-cmake#199

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
The USE_INTERNAL_URDF logic for include and
windows compiler definitions needs to be repeated
for tests that add parser_urdf.cc via target_sources.
An interface library is used to deduplicate the cmake
logic.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Account for new behavior of nested models and :: syntax.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from azeey as a code owner December 30, 2021 18:26
@github-actions github-actions bot added 🌱 garden Ignition Garden 🏯 fortress Ignition Fortress labels Dec 30, 2021
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Dec 30, 2021

Codecov Report

Merging #810 (15e6793) into sdf12 (5e91938) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##            sdf12     #810      +/-   ##
==========================================
- Coverage   90.70%   90.70%   -0.01%     
==========================================
  Files          78       78              
  Lines       12439    12437       -2     
==========================================
- Hits        11283    11281       -2     
  Misses       1156     1156              
Impacted Files Coverage Δ
src/Filesystem.cc 98.80% <ø> (ø)
src/FrameSemantics.cc 83.01% <ø> (-0.05%) ⬇️
src/World.cc 94.56% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5e91938...15e6793. Read the comment docs.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters merged commit 8785b7a into gazebosim:sdf12 Dec 30, 2021
@scpeters scpeters deleted the merge_11_to_12 branch December 30, 2021 23:06
scpeters added a commit that referenced this pull request Mar 21, 2022
* Install sdf/1.8 to versioned path
* Install sdf/1.9 to a versioned path.

Fixes a mistake from merging forward in #808 and #810.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@osrf-triage
Copy link
Copy Markdown

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏯 fortress Ignition Fortress 🌱 garden Ignition Garden

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants