Fix path logic

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Aug 10, 2023 · c9a1b85 · c9a1b85
1 parent 0f6044a
commit c9a1b85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -42,7 +42,7 @@ genrule(
         "sdf/**/*.convert",
     ]),
     outs = ["EmbeddedSdf.cc"],
-    cmd = "$(execpath :embed_sdf) --output-file $@ --sdf-root ./sdformat/sdf --input-files $(SRCS)",  # noqa
+    cmd = "$(execpath :embed_sdf) --output-file $@ --sdf-root sdformat/sdf --input-files $(SRCS)",  # noqa
     tools = [":embed_sdf"],
 )
 

diff --git a/sdf/embedSdf.py b/sdf/embedSdf.py
@@ -160,10 +160,10 @@ def generate_map_content(paths: List[Path], relative_to: Optional[str] = None) -
     for path in paths:
         with open(path, "r", encoding="utf8") as input_sdf:
             file_content = input_sdf.read()
-
             # Strip relative path if requested
             if relative_to is not None:
-                path = path.relative_to(relative_to)
+                _, relative_path = str(path).split(relative_to)
+                path = relative_path
             content.append(embed_sdf_content(str(path), file_content))
     return ",".join(content)