Merge pull request #1 from tricktron/f-runTask

RunFrege Task

1 files changed, 11 insertions, 3 deletions

diff --git a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
index 4f0bb34..8c50a5f 100644
--- a/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
+++ b/src/main/java/ch/fhnw/thga/gradleplugins/FregePlugin.java
@@ -7,6 +7,7 @@ import org.gradle.api.tasks.TaskProvider;
 public class FregePlugin implements Plugin<Project> {
     public static final String SETUP_FREGE_TASK_NAME = "setupFrege";
     public static final String COMPILE_FREGE_TASK_NAME = "compileFrege";
+    public static final String RUN_FREGE_TASK_NAME = "runFrege";
     public static final String FREGE_PLUGIN_ID = "ch.fhnw.thga.frege";
     public static final String FREGE_EXTENSION_NAME = "frege";
 
@@ -20,11 +21,18 @@ public class FregePlugin implements Plugin<Project> {
                     task.getDownloadDir().set(extension.getCompilerDownloadDir());
                 });
 
-        project.getTasks().register(COMPILE_FREGE_TASK_NAME, CompileFregeTask.class, task -> {
-            task.dependsOn(setupFregeCompilerTask);
+        TaskProvider<CompileFregeTask> compileFregeTask = project.getTasks().register(COMPILE_FREGE_TASK_NAME,
+                CompileFregeTask.class, task -> {
+                    task.dependsOn(setupFregeCompilerTask);
+                    task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath());
+                    task.getFregeMainSourceDir().set(extension.getMainSourceDir());
+                    task.getFregeOutputDir().set(extension.getOutputDir());
+                });
+        project.getTasks().register(RUN_FREGE_TASK_NAME, RunFregeTask.class, task -> {
+            task.dependsOn(compileFregeTask);
             task.getFregeCompilerJar().set(setupFregeCompilerTask.get().getFregeCompilerOutputPath());
-            task.getFregeMainSourceDir().set(extension.getMainSourceDir());
             task.getFregeOutputDir().set(extension.getOutputDir());
+            task.getMainModule().set(extension.getMainModule());
         });
     }
 }