Merge branch 'main' into nkoenig/remove-ign

gazebosim · Aug 2, 2023 · 2fa2477 · 2fa2477
2 parents 7b509e5 + 57511b8
commit 2fa2477
Show file tree

Hide file tree

Showing 11 changed files with 340 additions and 315 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ build
 build_*
 *.*.sw?
 .vscode
+__pycache__
diff --git a/sdf/1.10/CMakeLists.txt b/sdf/1.10/CMakeLists.txt
@@ -73,8 +73,8 @@ foreach(FIL ${sdfs})
 
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
-    COMMAND ${RUBY} ${CMAKE_SOURCE_DIR}/tools/xmlschema.rb
-    ARGS -s ${CMAKE_CURRENT_SOURCE_DIR} -i ${ABS_FIL} -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
+    ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${ABS_FIL}
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)

diff --git a/sdf/1.5/CMakeLists.txt b/sdf/1.5/CMakeLists.txt
@@ -67,8 +67,8 @@ foreach(FIL ${sdfs})
 
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
-    COMMAND ${RUBY} ${CMAKE_SOURCE_DIR}/tools/xmlschema.rb
-    ARGS -s ${CMAKE_CURRENT_SOURCE_DIR} -i ${ABS_FIL} -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${Pyhton3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
+    ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${ABS_FIL}
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)

diff --git a/sdf/1.6/CMakeLists.txt b/sdf/1.6/CMakeLists.txt
@@ -71,8 +71,8 @@ foreach(FIL ${sdfs})
 
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
-    COMMAND ${RUBY} ${CMAKE_SOURCE_DIR}/tools/xmlschema.rb
-    ARGS -s ${CMAKE_CURRENT_SOURCE_DIR} -i ${ABS_FIL} -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
+    ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${ABS_FIL}
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)

diff --git a/sdf/1.7/CMakeLists.txt b/sdf/1.7/CMakeLists.txt
@@ -72,8 +72,8 @@ foreach(FIL ${sdfs})
 
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
-    COMMAND ${RUBY} ${CMAKE_SOURCE_DIR}/tools/xmlschema.rb
-    ARGS -s ${CMAKE_CURRENT_SOURCE_DIR} -i ${ABS_FIL} -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
+    ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${ABS_FIL}
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)

diff --git a/sdf/1.8/CMakeLists.txt b/sdf/1.8/CMakeLists.txt
@@ -74,8 +74,8 @@ foreach(FIL ${sdfs})
 
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
-    COMMAND ${RUBY} ${CMAKE_SOURCE_DIR}/tools/xmlschema.rb
-    ARGS -s ${CMAKE_CURRENT_SOURCE_DIR} -i ${ABS_FIL} -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
+    ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${ABS_FIL}
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)

diff --git a/sdf/1.9/CMakeLists.txt b/sdf/1.9/CMakeLists.txt
@@ -74,8 +74,8 @@ foreach(FIL ${sdfs})
 
   add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
-    COMMAND ${RUBY} ${CMAKE_SOURCE_DIR}/tools/xmlschema.rb
-    ARGS -s ${CMAKE_CURRENT_SOURCE_DIR} -i ${ABS_FIL} -o ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
+    ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS ${ABS_FIL}
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)

diff --git a/src/Types.cc b/src/Types.cc
@@ -149,7 +149,7 @@ std::string JoinName(
 const std::string &internal::SdfScopeDelimiter()
 {
   static const gz::utils::NeverDestroyed<std::string> delimiter{
-      std::string()};
+      kScopeDelimiter};
   return delimiter.Access();
 }
 }

diff --git a/src/Types_TEST.cc b/src/Types_TEST.cc
@@ -120,6 +120,7 @@ TEST(Types, ErrorsOutputStream)
   EXPECT_EQ(expected, output.str());
 }
 
+/////////////////////////////////////////////////
 TEST(Types, SplitName)
 {
   {
@@ -159,6 +160,7 @@ TEST(Types, SplitName)
   }
 }
 
+/////////////////////////////////////////////////
 TEST(Types, JoinName)
 {
   {
@@ -198,3 +200,11 @@ TEST(Types, JoinName)
     EXPECT_EQ(joinedName, "");
   }
 }
+
+/////////////////////////////////////////////////
+TEST(Types, ScopeDelimiters)
+{
+  GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION
+  EXPECT_EQ(sdf::kScopeDelimiter, sdf::kSdfScopeDelimiter);
+  GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION
+}