From 9e2ebccc60cfa26d2c36a5d677cdb3565b5bd128 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Wed, 1 Dec 2021 10:01:43 +0100
Subject: [PATCH] 0.2.11

- add relast.extraOptions
- add ragconnect.extraOptions
---
 build.gradle                                           |  2 +-
 .../testing/plugin/RagConnectConfiguration.java        |  8 ++++++--
 .../preprocessor/testing/plugin/RagConnectTest.java    |  1 +
 .../testing/plugin/RelastConfiguration.java            | 10 ++++++++++
 .../preprocessor/testing/plugin/RelastTest.java        |  1 +
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index d5d8e11..9b337c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'org.jastadd.preprocessor'
-version '0.2.10'
+version '0.2.11'
 mainClassName = 'org.jastadd.preprocessor.testing.doc.DocumentationCreator'
 
 gradlePlugin {
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectConfiguration.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectConfiguration.java
index 062629d..e115687 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectConfiguration.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectConfiguration.java
@@ -6,6 +6,7 @@ import org.gradle.api.tasks.Optional;
 import org.jastadd.preprocessor.testing.doc.Description;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -63,6 +64,9 @@ public interface RagConnectConfiguration {
   @Description(value = "Add more options not directly supported")
   @Optional
   @Input
-  List<String> getAdditionalOptions();
-  void setAdditionalOptions(List<String> additionalOptions);
+  List<String> getExtraOptions();
+  void setExtraOptions(List<String> extraOptions);
+  default List<String> getExtraOptionsOrDefault() {
+    return getExtraOptions() != null ? getExtraOptions() : Collections.emptyList();
+  }
 }
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
index 1ee7ce5..db5723e 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java
@@ -120,6 +120,7 @@ public abstract class RagConnectTest extends RelastTest {
         if (getJastadd().getJastAddList() != null) {
           args.add("--List=" + getJastadd().getJastAddList());
         }
+        args.addAll(getRagconnect().getExtraOptionsOrDefault());
         args.addAll(getJastadd().getExtraOptionsOrDefault());
         args.addAll(getRagconnect().getInputFiles());
         javaExecSpec.args(args);
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastConfiguration.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastConfiguration.java
index bbccc50..c42cbc9 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastConfiguration.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastConfiguration.java
@@ -6,6 +6,7 @@ import org.gradle.api.tasks.Optional;
 import org.jastadd.preprocessor.testing.doc.Description;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -61,4 +62,13 @@ public interface RelastConfiguration {
   @Input
   boolean isVerbose();
   void setVerbose(boolean verbose);
+
+  @Description(value = "Add more options not directly supported")
+  @Optional
+  @Input
+  List<String> getExtraOptions();
+  void setExtraOptions(List<String> extraOptions);
+  default List<String> getExtraOptionsOrDefault() {
+    return getExtraOptions() != null ? getExtraOptions() : Collections.emptyList();
+  }
 }
diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
index 6dc5f15..5ae9dd4 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
@@ -127,6 +127,7 @@ public abstract class RelastTest extends DefaultTask {
           args.add("--serializer=" + getRelast().getSerializer());
         }
         args.add("--grammarName=" + pathToAbsoluteProject(getRelast().getGrammarName()));
+        args.addAll(getRelast().getExtraOptionsOrDefault());
         if (getRelast().isVerbose()) {
           System.out.println("Start relast with args: " + args + " and main: " + javaExecSpec.getMain());
         }
-- 
GitLab