From b996814fc3255338d7eae5a58c9b58dbf9229154 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <tgagnaux@gmail.com>
Date: Tue, 16 Nov 2021 16:45:06 +0100
Subject: feat: adds `compilerFlags` property to configure the Frege compiler

---
 .../fhnw/thga/gradleplugins/CompileFregeTask.java  | 30 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java')

diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java b/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
index 6ba6212..020bc7c 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/CompileFregeTask.java
@@ -1,6 +1,9 @@
 package ch.fhnw.thga.gradleplugins;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.inject.Inject;
 
@@ -8,8 +11,12 @@ import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.ListProperty;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.JavaExec;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
@@ -23,9 +30,22 @@ public abstract class CompileFregeTask extends DefaultTask {
     @InputDirectory
     public abstract DirectoryProperty getFregeMainSourceDir();
 
+    @Input
+    public abstract ListProperty<String> getFregeCompilerFlags();
+
     @OutputDirectory
     public abstract DirectoryProperty getFregeOutputDir();
 
+    @Internal
+    public final Provider<String> getFregeMainSourcePath() {
+        return getFregeMainSourceDir().map(srcDir -> srcDir.getAsFile().getAbsolutePath());
+    }
+
+    @Internal
+    public final Provider<List<String>> getSourcePathArg() {
+        return getFregeMainSourcePath().map(srcPath -> List.of("-sp", srcPath));
+    }
+
     @Inject
     public CompileFregeTask(ObjectFactory objectFactory) {
         javaExec = objectFactory.newInstance(JavaExec.class);
@@ -33,9 +53,11 @@ public abstract class CompileFregeTask extends DefaultTask {
 
     @TaskAction
     public void compileFrege() {
-        String fregeMainSourceDir = getFregeMainSourceDir().getAsFile().get().getAbsolutePath();
-        List<String> args = List.of("-v", "-d", getFregeOutputDir().get().getAsFile().getAbsolutePath(), "-sp",
-                fregeMainSourceDir, fregeMainSourceDir);
-        javaExec.setClasspath(getProject().files(getFregeCompilerJar())).setArgs(args).exec();
+        List<String> directoryArg = List.of("-d", getFregeOutputDir().getAsFile().get().getAbsolutePath());
+        List<String> compilerArgs = Stream
+                .of(getFregeCompilerFlags().get(), directoryArg, getSourcePathArg().get(),
+                        List.of(getFregeMainSourcePath().get()))
+                .flatMap(Collection::stream).collect(Collectors.toList());
+        javaExec.setClasspath(getProject().files(getFregeCompilerJar())).setArgs(compilerArgs).exec();
     }
 }
-- 
cgit