From ebe210aa5323f6471c6ef8307ea78f10c8cdff25 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Thu, 24 Mar 2022 11:29:16 +0100
Subject: [PATCH] Working on 0.3.0
- default behaviour for jastadd
---
.../org/jastadd/preprocessor/testing/plugin/RelastTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 e98def4..3175e4e 100644
--- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
+++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java
@@ -193,9 +193,12 @@ public abstract class RelastTest extends DefaultTask {
javaExecSpec.setClasspath(runtimeClasspath);
javaExecSpec.setMain("-jar");
args.add(RelastTest.jastaddCompilerLocation);
- } else {
+ } else if (RelastTest.jastaddCompilerConfiguration != null) {
javaExecSpec.setClasspath(RelastTest.jastaddCompilerConfiguration);
javaExecSpec.getMainClass().set("org.jastadd.JastAdd");
+ } else {
+ javaExecSpec.setClasspath(runtimeClasspath);
+ javaExecSpec.getMainClass().set("org.jastadd.JastAdd");
}
args.add("--o=" + pathToAbsoluteProject(getJastadd().getOutputDirOrDefault().getPath()));
args.add("--package=" + getJastadd().getPackageName());
--
GitLab