Skip to content

Merge sdf12 -> main#813

Merged
scpeters merged 24 commits intogazebosim:mainfrom
scpeters:merge_12_main
Jan 3, 2022
Merged

Merge sdf12 -> main#813
scpeters merged 24 commits intogazebosim:mainfrom
scpeters:merge_12_main

Conversation

@scpeters
Copy link
Copy Markdown
Member

@scpeters scpeters commented Jan 3, 2022

➡️ Forward port

Port sdf12 to main

Branch comparison: main...sdf12

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

iche033 and others added 24 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>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Add line with unrecognized type

Signed-off-by: Steve Peters <scpeters@openrobotics.org>

* Fix for custom element with attribute 'type' (gazebosim#811)

* Reverted changes to parser for custom element with attribute 'type',
  added fix in ParamPrivate::ValueFromStringImpl instead

Signed-off-by: Aaron Chong <aaronchongth@gmail.com>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Aaron Chong <aaronchongth@gmail.com>
@scpeters scpeters requested a review from azeey as a code owner January 3, 2022 09:13
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jan 3, 2022
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jan 3, 2022

Codecov Report

Merging #813 (fc5d1f2) into main (1495b3f) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #813      +/-   ##
==========================================
- Coverage   90.69%   90.69%   -0.01%     
==========================================
  Files          78       78              
  Lines       12440    12433       -7     
==========================================
- Hits        11283    11276       -7     
  Misses       1157     1157              
Impacted Files Coverage Δ
src/Filesystem.cc 98.80% <ø> (ø)
src/FrameSemantics.cc 83.01% <ø> (-0.05%) ⬇️
src/Param.cc 91.29% <100.00%> (+0.01%) ⬆️
src/World.cc 94.56% <100.00%> (ø)
src/parser.cc 87.48% <100.00%> (-0.07%) ⬇️

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 1495b3f...fc5d1f2. Read the comment docs.

@scpeters scpeters merged commit 1df5df2 into gazebosim:main Jan 3, 2022
@scpeters scpeters deleted the merge_12_main branch January 3, 2022 19:14
@scpeters scpeters mentioned this pull request Jan 5, 2022
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🌱 garden Ignition Garden

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants