Merge branch 'sdf15' into scpeters/state_1_12

CMakeLists.txt

@@ -43,7 +43,7 @@ if (BUILD_SDF)
   gz_configure_project(
     NO_PROJECT_PREFIX
     REPLACE_INCLUDE_PATH sdf
-    VERSION_SUFFIX)
+    VERSION_SUFFIX pre1)
 
   #################################################
   # Find tinyxml2.

Changelog.md

@@ -2,6 +2,14 @@
 
 ### libsdformat 15.0.0 (2024-09-XX)
 
+1. **Baseline:** this includes all changes from 14.5.0 and earlier.
+
+1. README: update badges for sdf15
+    * [Pull request #1472](https://github.com/gazebosim/sdformat/pull/1472)
+
+1. Ionic Changelog
+    * [Pull request #1471](https://github.com/gazebosim/sdformat/pull/1471)
+
 1. Spec 1.12: add `_state` suffix to //state subelements
     * [Pull request #1455](https://github.com/gazebosim/sdformat/pull/1455)
 
@@ -27,6 +35,10 @@
 1. Print auto inertial values with `gz sdf --print --expand-auto-inertials`
     * [Pull request #1422](https://github.com/gazebosim/sdformat/pull/1422)
 
+1. Add cone shape to SDFormat spec
+    * [Pull request #1418](https://github.com/gazebosim/sdformat/pull/1418)
+    * [Pull request #1434](https://github.com/gazebosim/sdformat/pull/1434)
+
 1. Enable 24.04 CI, remove distutils dependency
     * [Pull request #1408](https://github.com/gazebosim/sdformat/pull/1408)
 
@@ -38,6 +50,11 @@
     * [Pull request #1399](https://github.com/gazebosim/sdformat/pull/1399)
     * [Pull request #1462](https://github.com/gazebosim/sdformat/pull/1462)
 
+1. Spec 1.11+: add `//mesh/@optimization`, `//mesh/convex_decomposition`
+    * [Pull request #1382](https://github.com/gazebosim/sdformat/pull/1382)
+    * [Pull request #1386](https://github.com/gazebosim/sdformat/pull/1386)
+    * [Pull request #1403](https://github.com/gazebosim/sdformat/pull/1403)
+
 1. Copy 1.11 spec to 1.12 for libsdformat15
     * [Pull request #1375](https://github.com/gazebosim/sdformat/pull/1375)
 

README.md

@@ -10,10 +10,10 @@ Note: The branch name in the codecov URL & library version should be updated whe
 -->
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/gazebosim/sdformat/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/sdformat/tree/main)
-Ubuntu Jammy  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=sdformat-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/sdformat-ci-main-jammy-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=sdformat-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/sdformat-ci-main-homebrew-amd64)
-Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=sdformat-main-win)](https://build.osrfoundation.org/job/sdformat-main-win)
+Test coverage | [![codecov](https://codecov.io/gh/gazebosim/sdformat/tree/sdf15/graph/badge.svg)](https://codecov.io/gh/gazebosim/sdformat/tree/sdf15)
+Ubuntu Jammy  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=sdformat-ci-sdf15-noble-amd64)](https://build.osrfoundation.org/job/sdformat-ci-sdf15-noble-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=sdformat-ci-sdf15-homebrew-amd64)](https://build.osrfoundation.org/job/sdformat-ci-sdf15-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=sdformat-sdf15-win)](https://build.osrfoundation.org/job/sdformat-sdf15-win)
 
 
 SDFormat is an XML file format that describes environments, objects, and robots

test/integration/all_symbols_have_version.bash.in

@@ -4,7 +4,13 @@ LIBPATH=$1
 VERSIONED_NS=v@PROJECT_VERSION_MAJOR@
 
 # Sanity check - there should be at least one symbol
-NUM_SYMBOLS=$(nm $LIBPATH | grep -e "sdf" | wc -l)
+
+# nm options:
+# -D to get only dynamic symbols exported
+# 3 before the sdf is <length, id> used by
+# mangled symbols in C++ to check for the
+# sdf namespace
+NUM_SYMBOLS=$(nm -D $LIBPATH | grep -e "3sdf" | wc -l)
 
 if [ $NUM_SYMBOLS -eq 0 ]
 then
@@ -13,7 +19,7 @@ then
 fi
 
 # There must be no unversioned symbols
-UNVERSIONED_SYMBOLS=$(nm $LIBPATH | grep -e "sdf" | grep -e "$VERSIONED_NS" -v)
+UNVERSIONED_SYMBOLS=$(nm -D $LIBPATH | grep -e "3sdf" | grep -e "$VERSIONED_NS" -v)
 UNVERSIONED_SYMBOL_CHARS=$(printf "$UNVERSIONED_SYMBOLS" | wc -m)
 
 if [ $UNVERSIONED_SYMBOL_CHARS -ne 0 ]