Fix duplicate generated files in lang.test.

metaborg · Oct 6, 2021 · 6ee1c79 · 6ee1c79
1 parent 9a964ba
commit 6ee1c79
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/lang/lang.test/build.gradle.kts b/lang/lang.test/build.gradle.kts
@@ -33,10 +33,20 @@ dependencies {
   testImplementation(project(":pie.lang.runtime.java"))
 }
 
+val pieGenSourcesDir = "build/generated/piesources/"
+
 sourceSets {
   test {
     java {
-      srcDir("build/generated/sources/")
+      srcDir(pieGenSourcesDir)
+    }
+  }
+}
+
+afterEvaluate {
+  tasks.named("spoofaxBuild").configure {
+    doFirst {
+      project.file(pieGenSourcesDir).mkdirs()
     }
   }
 }
diff --git a/lang/lang.test/pie/config.txt b/lang/lang.test/pie/config.txt
@@ -1 +1 @@
-./build/generated/sources/
+./build/generated/piesources/
diff --git a/lang/lang/trans/gen/java/main.str b/lang/lang/trans/gen/java/main.str
@@ -55,7 +55,7 @@ rules
     (file, Program(moduleStmt, _, _)) -> result
     with
     // Note: this strategy assumes files of the form "path/to/file.pie"
-      relativeTargetDir    := <config-get-output-dir>
+      relativeTargetDir    := <config-get-output-dir; trim-whitespace; trim-chars(?'\n'); trim-chars(?'\r')>
     ; ['.' | ['/' | rest]] := <explode-string> relativeTargetDir
     ; '/'                  := <last> rest // assert that last character is a /
     ; rootPackageDir       := <implode-string> rest