Correct ninja syntax on Windows

googlefonts · Sep 21, 2023 · 71c5f6f · 71c5f6f
1 parent 09bf21a
commit 71c5f6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Lib/gftools/builder/__init__.py b/Lib/gftools/builder/__init__.py
@@ -9,7 +9,7 @@
 from dataclasses import dataclass
 import os.path
 import networkx as nx
-from ninja.ninja_syntax import Writer
+from ninja.ninja_syntax import Writer, escape_path
 from fontmake.font_project import FontProject
 
 from gftools.builder.file import File
@@ -247,7 +247,7 @@ def walk_graph(self):
             edge["operation"].validate()
             actions[(source, edge["operation"])].append(target)
             if not list(self.graph.successors(target)):
-                final_targets.append(target.path)
+                final_targets.append(escape_path(target.path))
 
         for (source, operation), targets in actions.items():
             operation.build(self.writer)

diff --git a/Lib/gftools/builder/operations/instantiateUfo.py b/Lib/gftools/builder/operations/instantiateUfo.py
@@ -7,6 +7,7 @@
 import gftools.builder
 from functools import cached_property
 from glyphsLib.builder import UFOBuilder
+from ninja.ninja_syntax import Writer, escape_path
 from fontTools.designspaceLib import InstanceDescriptor
 
 
@@ -52,9 +53,9 @@ def targets(self):
     def variables(self):
         vars = super().variables
         if self.first_source.is_glyphs:
-            vars["fontmake_args"] += f"--instance-dir '{self.instance_dir}'"
+            vars["fontmake_args"] += f"--instance-dir {escape_path(str(self.instance_dir))}"
         else:
-            vars["fontmake_args"] += f"--output-dir '{self.instance_dir}'"
+            vars["fontmake_args"] += f"--output-dir {escape_path(str(self.instance_dir))}"
         vars["instance_name"] = self.original["instance_name"]
         return vars