Skip to content

Merge sdf10 -> sdf11#808

Merged
scpeters merged 7 commits intogazebosim:sdf11from
scpeters:merge_10_11
Dec 30, 2021
Merged

Merge sdf10 -> sdf11#808
scpeters merged 7 commits intogazebosim:sdf11from
scpeters:merge_10_11

Conversation

@scpeters
Copy link
Copy Markdown
Member

@scpeters scpeters commented Dec 29, 2021

➡️ Forward port

Port sdf10 to sdf11. There were some conflicts that I resolved in 4ea05ef while merging:

  • find version 6.8 of ignition-math6
  • find ignition-utils1

Branch comparison: sdf11...sdf10

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

@scpeters
Replace custom cmake code with ign-cmake2 (gazebosim#780)
92d20d2 
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>
@scpeters
Prepare for 10.7.0~pre1 (gazebosim#799)
1a2c406 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Fix test compilation with USE_INTERNAL_URDF (gazebosim#800)
cf81994 
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>
@scpeters
Prepare for 10.7.0~pre2 (gazebosim#802)
1741bb0 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Prepare for 10.7.0, final Dome release (gazebosim#804)
5f326e9 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters requested a review from chapulina December 29, 2021 20:45
@scpeters scpeters requested a review from azeey as a code owner December 29, 2021 20:45
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Dec 29, 2021
scpeters added a commit to scpeters/sdformat that referenced this pull request Dec 29, 2021
@scpeters
Support compilation with static libraries (gazebosim#808)
40b54f0 
Restore functionality of gazebosim#394. Submitted a fix upstream
in gazebosim/gz-cmake#203.

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

scpeters commented Dec 29, 2021 •
edited
Loading

I resolved one extra merge conflict in 40b54f0, which is an attempt to retain the functionality for compiling static libraries contributed in #394 by @joxoby with reviews from @traversaro and @madebr. I've also submitted gazebosim/gz-cmake#203 to add this functionality to ign-cmake.

Update: I have reverted this commit since it sounds like it is not needed

@scpeters scpeters mentioned this pull request Dec 29, 2021
Merged
8 tasks
scpeters added a commit to scpeters/sdformat that referenced this pull request Dec 29, 2021
@scpeters
Fix compiler warnings (gazebosim#808)
4abb38c 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/sdformat that referenced this pull request Dec 29, 2021
@scpeters
Support compilation with static libraries (gazebosim#808)
72c4853 
Restore functionality of gazebosim#394. Submitted a fix upstream
in gazebosim/gz-cmake#203.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit to scpeters/sdformat that referenced this pull request Dec 29, 2021
@scpeters
Fix compiler warnings (gazebosim#808)
34cf35a 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters mentioned this pull request Dec 30, 2021
Closed
7 tasks
@scpeters
Fix compiler warnings (gazebosim#808)
f03ec70 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Dec 30, 2021

Codecov Report

Merging #808 (f03ec70) into sdf11 (5c6e870) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##            sdf11     #808      +/-   ##
==========================================
- Coverage   88.89%   88.89%   -0.01%     
==========================================
  Files          73       73              
  Lines       11072    11070       -2     
==========================================
- Hits         9843     9841       -2     
  Misses       1229     1229
Impacted Files Coverage Δ
src/Filesystem.cc 98.80% <ø> (ø)
src/FrameSemantics.cc 73.85% <ø> (-0.05%) ⬇️
src/World.cc 96.23% <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 5c6e870...f03ec70. Read the comment docs.

@scpeters scpeters merged commit 206e698 into gazebosim:sdf11 Dec 30, 2021
@scpeters scpeters deleted the merge_10_11 branch December 30, 2021 18:15
scpeters added a commit to scpeters/sdformat that referenced this pull request Mar 21, 2022
@scpeters
Install sdf/1.8 to versioned path
2382182 
Fixes a mistake from merging forward in gazebosim#808.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters mentioned this pull request Mar 21, 2022
Merged
7 tasks
scpeters added a commit to scpeters/sdformat that referenced this pull request Mar 21, 2022
@scpeters
Install sdf/1.8 to versioned path
c745106 
Fixes a mistake from merging forward in gazebosim#808.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters mentioned this pull request Mar 21, 2022
Merged
7 tasks
scpeters added a commit that referenced this pull request Mar 21, 2022
@scpeters
Install sdf/1.8 to versioned path (#890)
f9e3e3d 
Fixes a mistake from merging forward in #808.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
scpeters added a commit that referenced this pull request Mar 21, 2022
@scpeters
Install sdf/1.8 and sdf/1.9 to versioned paths (#891)
cd0e873 
* 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

osrf-triage commented Mar 25, 2022

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

https://community.gazebosim.org/t/new-ignition-releases-2022-03-25-fortress-edifice-citadel/1343/1

@osrf-triage
Copy link
Copy Markdown

osrf-triage commented Apr 13, 2022

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

Reviewers

@ahcorde ahcorde ahcorde approved these changes

@chapulina chapulina Awaiting requested review from chapulina

@azeey azeey Awaiting requested review from azeey azeey is a code owner

Assignees

No one assigned

Labels

🏢 edifice Ignition Edifice

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@scpeters @codecov-commenter @osrf-triage @ahcorde @j-rivero @chapulina