diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/CompilerLocationExtension.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/CompilerLocationExtension.java index 362d47e930b173ce4e2173a7a4ca8897110740ad..2e24b49326719b0bf25046d799784da39593a907 100644 --- a/src/main/java/org/jastadd/preprocessor/testing/plugin/CompilerLocationExtension.java +++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/CompilerLocationExtension.java @@ -11,18 +11,32 @@ import org.gradle.api.provider.Property; * @author rschoene - Initial contribution */ public class CompilerLocationExtension { + public Property<String> jastaddCompilerLocation; + public Property<FileCollection> jastaddCompilerConfiguration; public Property<String> relastCompilerLocation; public Property<FileCollection> relastCompilerConfiguration; public Property<String> ragconnectCompilerLocation; public Property<FileCollection> ragconnectCompilerConfiguration; public CompilerLocationExtension(Project project) { + jastaddCompilerLocation = project.getObjects().property(String.class); + jastaddCompilerConfiguration = project.getObjects().property(FileCollection.class); relastCompilerLocation = project.getObjects().property(String.class); relastCompilerConfiguration = project.getObjects().property(FileCollection.class); ragconnectCompilerLocation = project.getObjects().property(String.class); ragconnectCompilerConfiguration = project.getObjects().property(FileCollection.class); } + @Deprecated + @ReplacedBy("jastaddCompilerConfiguration") + public Property<String> getJastAddCompilerLocation() { + return jastaddCompilerLocation; + } + + public Property<FileCollection> getJastAddCompilerConfiguration() { + return jastaddCompilerConfiguration; + } + @Deprecated @ReplacedBy("relastCompilerConfiguration") public Property<String> getRelastCompilerLocation() { diff --git a/src/main/java/org/jastadd/preprocessor/testing/plugin/PreprocessorPlugin.java b/src/main/java/org/jastadd/preprocessor/testing/plugin/PreprocessorPlugin.java index fa5289fd6f05c8c3ed3f40721c5f81a7907e0abe..1562c53e6f53aabfb9dd7bc3698e26a3492f5e86 100644 --- a/src/main/java/org/jastadd/preprocessor/testing/plugin/PreprocessorPlugin.java +++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/PreprocessorPlugin.java @@ -29,6 +29,8 @@ public class PreprocessorPlugin implements Plugin<Project> { // set compiler locations (if set) project.afterEvaluate(p -> { + RelastTest.setJastAddCompilerLocation(extension.getJastAddCompilerLocation().getOrNull()); + RelastTest.setJastAddCompilerConfiguration(extension.getJastAddCompilerConfiguration().getOrNull()); RelastTest.setRelastCompilerLocation(extension.getRelastCompilerLocation().getOrNull()); RelastTest.setRelastCompilerConfiguration(extension.getRelastCompilerConfiguration().getOrNull()); RagConnectTest.setRagconnectCompilerLocation(extension.getRagconnectCompilerLocation().getOrNull()); 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 0bdfc734b56a689781e2752c2492a4e65756cbba..0f4ad73687e7715c4acefc18a9c62d2f71723b7c 100644 --- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java +++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RagConnectTest.java @@ -94,11 +94,11 @@ public abstract class RagConnectTest extends RelastTest { FileCollection runtimeClasspath = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getRuntimeClasspath(); project.javaexec(javaExecSpec -> { List<Object> args = new ArrayList<>(); - javaExecSpec.setClasspath(runtimeClasspath); if (ragconnectCompilerLocation != null) { if (isVerbose()) { System.err.println("ragconnectCompilerLocation is deprecated, use ragconnectCompilerConfiguration instead"); } + javaExecSpec.setClasspath(runtimeClasspath); javaExecSpec.setMain("-jar"); args.add(ragconnectCompilerLocation); } else { 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 03491c5639db650d0da8315548d8e500b23f281e..e98def445a141b444434722d5e55b9efeeb2b499 100644 --- a/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java +++ b/src/main/java/org/jastadd/preprocessor/testing/plugin/RelastTest.java @@ -26,6 +26,8 @@ import static groovy.lang.Closure.DELEGATE_FIRST; */ public abstract class RelastTest extends DefaultTask { // configuration from plugin + private static String jastaddCompilerLocation; + private static FileCollection jastaddCompilerConfiguration; private static String relastCompilerLocation; private static FileCollection relastCompilerConfiguration; @@ -35,6 +37,14 @@ public abstract class RelastTest extends DefaultTask { @Nested abstract JastAddConfiguration getJastadd(); + public static void setJastAddCompilerLocation(String jastaddCompilerLocation) { + RelastTest.jastaddCompilerLocation = jastaddCompilerLocation; + } + + public static void setJastAddCompilerConfiguration(FileCollection jastaddCompilerConfiguration) { + RelastTest.jastaddCompilerConfiguration = jastaddCompilerConfiguration; + } + public static void setRelastCompilerLocation(String relastCompilerLocation) { RelastTest.relastCompilerLocation = relastCompilerLocation; } @@ -119,11 +129,11 @@ public abstract class RelastTest extends DefaultTask { FileCollection runtimeClasspath = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getRuntimeClasspath(); project.javaexec(javaExecSpec -> { List<String> args = new ArrayList<>(); - javaExecSpec.setClasspath(runtimeClasspath); if (RelastTest.relastCompilerLocation != null) { if (isVerbose()) { System.err.println("relastCompilerLocation is deprecated, use relastCompilerConfiguration instead"); } + javaExecSpec.setClasspath(runtimeClasspath); javaExecSpec.setMain("-jar"); args.add(RelastTest.relastCompilerLocation); } else { @@ -175,9 +185,18 @@ public abstract class RelastTest extends DefaultTask { SourceSetContainer sourceSets = (SourceSetContainer) project.getProperties().get("sourceSets"); FileCollection runtimeClasspath = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getRuntimeClasspath(); project.javaexec(javaExecSpec -> { - javaExecSpec.setClasspath(runtimeClasspath); - javaExecSpec.setMain("org.jastadd.JastAdd"); List<Object> args = new ArrayList<>(); + if (RelastTest.jastaddCompilerLocation != null) { + if (isVerbose()) { + System.err.println("jastaddCompilerLocation is deprecated, use jastaddCompilerConfiguration instead"); + } + javaExecSpec.setClasspath(runtimeClasspath); + javaExecSpec.setMain("-jar"); + args.add(RelastTest.jastaddCompilerLocation); + } else { + javaExecSpec.setClasspath(RelastTest.jastaddCompilerConfiguration); + javaExecSpec.getMainClass().set("org.jastadd.JastAdd"); + } args.add("--o=" + pathToAbsoluteProject(getJastadd().getOutputDirOrDefault().getPath())); args.add("--package=" + getJastadd().getPackageName()); if (getJastadd().getJastAddList() != null) {