bzlmod support

BUILD.bazel

@@ -29,10 +29,10 @@ gz_export_header(
 gz_configure_header(
     name = "Config",
     src = "include/sdf/config.hh.in",
-    defines = {
-        "CMAKE_INSTALL_FULL_DATAROOTDIR": "unused",
-        "SDF_PROTOCOL_VERSION": "11111",
-    },
+    defines = [
+        "CMAKE_INSTALL_FULL_DATAROOTDIR=unused",
+        "SDF_PROTOCOL_VERSION=1.12",
+    ],
     package_xml = "package.xml",
 )
 
@@ -94,6 +94,9 @@ cc_library(
         exclude = [
         ],
     ),
+    data = [
+        "sdf",
+    ],
     defines = [
         "CMAKE_INSTALL_RELATIVE_DATAROOTDIR=\\\"\\\"",
         'SDF_SHARE_PATH=\\".\\"',
@@ -103,9 +106,6 @@ cc_library(
         "include",
         "src",
     ],
-    data = [
-        "sdf"
-    ],
     deps = [
         ":Config",
         ":Export",

src/Actor_TEST.cc

@@ -20,8 +20,6 @@
 #include "sdf/Actor.hh"
 #include "sdf/Plugin.hh"
 
-#include <filesystem>
-
 /////////////////////////////////////////////////
 sdf::Animation CreateDummyAnimation()
 {
@@ -511,9 +509,6 @@ TEST(DOMActor, ToElement)
 {
   sdf::Actor actor;
 
-  // Output the current working directory
-  std::cout << std::filesystem::current_path() << std::endl;
-
   actor.SetName("my-actor");
   actor.SetRawPose(gz::math::Pose3d(1, 2, 3, 0.1, 0.2, 0.3));
   actor.SetSkinFilename("my-skinfilename");

src/SDF.cc

@@ -538,13 +538,9 @@ const std::string &SDF::EmbeddedSpec(
 const std::string &SDF::EmbeddedSpec(
     sdf::Errors &_errors, const std::string &_filename)
 {
-
   try
   {
     const std::string pathname = SDF::Version() + "/" + _filename;
-
-    std::cout << "Reading: " << pathname << std::endl;
-
     return GetEmbeddedSdf().at(pathname);
   }
   catch(const std::out_of_range &)

src/bazel/InstallationDirectories.cc

@@ -1,4 +1,19 @@
-// Generate an installation directories file for bazel specifically
+/*
+ * Copyright (C) 2024 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
 
 #include <sdf/InstallationDirectories.hh>
 
@@ -7,9 +22,11 @@ namespace sdf
 
 inline namespace SDF_VERSION_NAMESPACE {
 
+// Generate an install prefix specifically for bazel build.
 std::string getInstallPrefix()
 {
   return ".";
 }
 }  // namespace SDF_VERSION_NAMESPACE
-}  // namespace sdf
+}  // namespace sdf
+