Merge pull request #468 from icyphy/bin-dir

file-config: place binaries in bin, not src-gen/bin
lf-lang · Aug 19, 2021 · 8938a19 · 8938a19
2 parents 8eea5d3 + 4541047
commit 8938a19
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/org.lflang/src/org/lflang/FileConfig.java b/org.lflang/src/org/lflang/FileConfig.java
@@ -175,7 +175,7 @@ public FileConfig(Resource resource, IFileSystemAccess2 fsa, IGeneratorContext c
         this.srcGenPath = getSrcGenPath(this.srcGenBasePath, this.srcPkgPath,
                 this.srcPath, name);
         this.srcGenPkgPath = this.srcGenPath;
-        this.outPath = getOutputRoot(srcGenBasePath);
+        this.outPath = srcGenBasePath.resolve("..");
         this.binPath = getBinPath(this.srcPkgPath, this.srcPath, this.outPath, context);
         this.iResource = getIResource(resource);
     }
@@ -201,7 +201,7 @@ protected FileConfig(FileConfig fileConfig) throws IOException {
         this.srcGenPath = getSrcGenPath(this.srcGenBasePath, this.srcPkgPath,
                 this.srcPath, name);
         this.srcGenPkgPath = this.srcGenPath;
-        this.outPath = getOutputRoot(srcGenBasePath);
+        this.outPath = srcGenBasePath.resolve("..");
         this.binPath = getBinPath(this.srcPkgPath, this.srcPath, this.outPath, context);
         this.iResource = getIResource(resource);
     }
@@ -352,10 +352,6 @@ public Path getRTIBinPath() {
         return this.binPath;
     }
 
-    private static Path getOutputRoot(Path srcGenRoot) {
-        return Paths.get(".").resolve(srcGenRoot);
-    }
-
     /**
      * Return the output directory for generated binary files.
      */