Skip to content
Snippets Groups Projects
Commit 9e2ebccc authored by René Schöne's avatar René Schöne
Browse files

0.2.11

- add relast.extraOptions
- add ragconnect.extraOptions
parent 8906c92d
No related branches found
No related tags found
No related merge requests found
Pipeline #12029 passed
...@@ -5,7 +5,7 @@ plugins { ...@@ -5,7 +5,7 @@ plugins {
} }
group 'org.jastadd.preprocessor' group 'org.jastadd.preprocessor'
version '0.2.10' version '0.2.11'
mainClassName = 'org.jastadd.preprocessor.testing.doc.DocumentationCreator' mainClassName = 'org.jastadd.preprocessor.testing.doc.DocumentationCreator'
gradlePlugin { gradlePlugin {
......
...@@ -6,6 +6,7 @@ import org.gradle.api.tasks.Optional; ...@@ -6,6 +6,7 @@ import org.gradle.api.tasks.Optional;
import org.jastadd.preprocessor.testing.doc.Description; import org.jastadd.preprocessor.testing.doc.Description;
import java.io.File; import java.io.File;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
...@@ -63,6 +64,9 @@ public interface RagConnectConfiguration { ...@@ -63,6 +64,9 @@ public interface RagConnectConfiguration {
@Description(value = "Add more options not directly supported") @Description(value = "Add more options not directly supported")
@Optional @Optional
@Input @Input
List<String> getAdditionalOptions(); List<String> getExtraOptions();
void setAdditionalOptions(List<String> additionalOptions); void setExtraOptions(List<String> extraOptions);
default List<String> getExtraOptionsOrDefault() {
return getExtraOptions() != null ? getExtraOptions() : Collections.emptyList();
}
} }
...@@ -120,6 +120,7 @@ public abstract class RagConnectTest extends RelastTest { ...@@ -120,6 +120,7 @@ public abstract class RagConnectTest extends RelastTest {
if (getJastadd().getJastAddList() != null) { if (getJastadd().getJastAddList() != null) {
args.add("--List=" + getJastadd().getJastAddList()); args.add("--List=" + getJastadd().getJastAddList());
} }
args.addAll(getRagconnect().getExtraOptionsOrDefault());
args.addAll(getJastadd().getExtraOptionsOrDefault()); args.addAll(getJastadd().getExtraOptionsOrDefault());
args.addAll(getRagconnect().getInputFiles()); args.addAll(getRagconnect().getInputFiles());
javaExecSpec.args(args); javaExecSpec.args(args);
......
...@@ -6,6 +6,7 @@ import org.gradle.api.tasks.Optional; ...@@ -6,6 +6,7 @@ import org.gradle.api.tasks.Optional;
import org.jastadd.preprocessor.testing.doc.Description; import org.jastadd.preprocessor.testing.doc.Description;
import java.io.File; import java.io.File;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
...@@ -61,4 +62,13 @@ public interface RelastConfiguration { ...@@ -61,4 +62,13 @@ public interface RelastConfiguration {
@Input @Input
boolean isVerbose(); boolean isVerbose();
void setVerbose(boolean verbose); 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();
}
} }
...@@ -127,6 +127,7 @@ public abstract class RelastTest extends DefaultTask { ...@@ -127,6 +127,7 @@ public abstract class RelastTest extends DefaultTask {
args.add("--serializer=" + getRelast().getSerializer()); args.add("--serializer=" + getRelast().getSerializer());
} }
args.add("--grammarName=" + pathToAbsoluteProject(getRelast().getGrammarName())); args.add("--grammarName=" + pathToAbsoluteProject(getRelast().getGrammarName()));
args.addAll(getRelast().getExtraOptionsOrDefault());
if (getRelast().isVerbose()) { if (getRelast().isVerbose()) {
System.out.println("Start relast with args: " + args + " and main: " + javaExecSpec.getMain()); System.out.println("Start relast with args: " + args + " and main: " + javaExecSpec.getMain());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment