Use relative paths for the grammar input files

The file paths that are passed to antlr end up in the generated output so using absolute paths breaks caching. Fixes marcohu#12.
rrbutani · May 14, 2021 · b468b28 · b468b28
1 parent 89a29cc
commit b468b28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/antlr/antlr3.bzl b/antlr/antlr3.bzl
@@ -48,7 +48,7 @@ def _args(ctx, output_dir):
     if ctx.attr.nfa:
         args.add("-nfa")
 
-    args.add("-o")
+    args.add("-fo")
     args.add(output_dir)
 
     if ctx.attr.profile:

diff --git a/antlr/antlr4.bzl b/antlr/antlr4.bzl
@@ -58,6 +58,7 @@ def _args(ctx, output_dir):
     if ctx.attr.no_visitor:
         args.add("-no-visitor")
 
+    args.add("-Xexact-output-dir")
     args.add("-o")
     args.add(output_dir)
 

diff --git a/src/main/java/org/antlr/bazel/AntlrRules.java b/src/main/java/org/antlr/bazel/AntlrRules.java
@@ -376,7 +376,7 @@ AntlrRules grammars(String... grammars)
 
         for (String grammar : grammars)
         {
-            this.grammars.add(sandbox.resolve(grammar).toString());
+            this.grammars.add(grammar.toString());
         }
 
         return this;