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

Use correct paths, 0.2.7

parent 09f2414c
No related branches found
No related tags found
No related merge requests found
Pipeline #8880 passed
...@@ -4,7 +4,7 @@ plugins { ...@@ -4,7 +4,7 @@ plugins {
} }
group 'org.jastadd.preprocessor' group 'org.jastadd.preprocessor'
version '0.2.6' version '0.2.7'
gradlePlugin { gradlePlugin {
plugins { plugins {
......
package org.jastadd.preprocessor.testing.plugin; package org.jastadd.preprocessor.testing.plugin;
import org.gradle.api.tasks.Input; import org.gradle.api.tasks.*;
import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.OutputDirectory;
import java.io.File; import java.io.File;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -51,4 +49,9 @@ public interface JastAddConfiguration { ...@@ -51,4 +49,9 @@ public interface JastAddConfiguration {
default File getOutputDirOrDefault() { default File getOutputDirOrDefault() {
return getOutputDir() != null ? getOutputDir() : Paths.get("src", "test", "java-gen").toFile(); return getOutputDir() != null ? getOutputDir() : Paths.get("src", "test", "java-gen").toFile();
} }
@OutputDirectory
default File getPackageOutputDir() {
return getOutputDirOrDefault().toPath().resolve(getPackageName().replace('.', File.separatorChar)).toFile();
}
} }
...@@ -18,7 +18,6 @@ import java.nio.file.Path; ...@@ -18,7 +18,6 @@ import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import static groovy.lang.Closure.DELEGATE_FIRST; import static groovy.lang.Closure.DELEGATE_FIRST;
...@@ -47,12 +46,14 @@ public abstract class RelastTest extends DefaultTask { ...@@ -47,12 +46,14 @@ public abstract class RelastTest extends DefaultTask {
return Paths.get(getProject().getProjectDir().getAbsolutePath(), filename); return Paths.get(getProject().getProjectDir().getAbsolutePath(), filename);
} }
@SuppressWarnings("unused")
public void relast(Closure<?> c) { public void relast(Closure<?> c) {
c.setResolveStrategy(DELEGATE_FIRST); c.setResolveStrategy(DELEGATE_FIRST);
c.setDelegate(getRelast()); c.setDelegate(getRelast());
c.call(); c.call();
} }
@SuppressWarnings("unused")
public void jastadd(Closure<?> c) { public void jastadd(Closure<?> c) {
c.setResolveStrategy(DELEGATE_FIRST); c.setResolveStrategy(DELEGATE_FIRST);
c.setDelegate(getJastadd()); c.setDelegate(getJastadd());
...@@ -85,7 +86,7 @@ public abstract class RelastTest extends DefaultTask { ...@@ -85,7 +86,7 @@ public abstract class RelastTest extends DefaultTask {
deleteSpec.delete(getJastadd().getOutputDirOrDefault().toPath().resolve(getJastadd().getPackageName())); deleteSpec.delete(getJastadd().getOutputDirOrDefault().toPath().resolve(getJastadd().getPackageName()));
}); });
// create output directories, if not existing // create output directories, if not existing
createDirectory(pathToAbsoluteProject(getJastadd().getOutputDirOrDefault().getName())); createDirectory(pathToAbsoluteProject(getJastadd().getOutputDirOrDefault().getPath()));
createDirectory(pathToAbsoluteProject(getRelast().getGrammarName()).getParent()); createDirectory(pathToAbsoluteProject(getRelast().getGrammarName()).getParent());
if (getRelast().isVerbose()) { if (getRelast().isVerbose()) {
System.out.println("Pre processing, running relast"); System.out.println("Pre processing, running relast");
...@@ -150,7 +151,7 @@ public abstract class RelastTest extends DefaultTask { ...@@ -150,7 +151,7 @@ public abstract class RelastTest extends DefaultTask {
javaExecSpec.setClasspath(runtimeClasspath); javaExecSpec.setClasspath(runtimeClasspath);
javaExecSpec.setMain("org.jastadd.JastAdd"); javaExecSpec.setMain("org.jastadd.JastAdd");
List<Object> args = new ArrayList<>(); List<Object> args = new ArrayList<>();
args.add("--o=" + pathToAbsoluteProject(getJastadd().getOutputDirOrDefault().getName())); args.add("--o=" + pathToAbsoluteProject(getJastadd().getOutputDirOrDefault().getPath()));
args.add("--package=" + getJastadd().getPackageName()); args.add("--package=" + getJastadd().getPackageName());
if (getJastadd().getJastAddList() != null) { if (getJastadd().getJastAddList() != null) {
args.add("--List=" + getJastadd().getJastAddList()); args.add("--List=" + getJastadd().getJastAddList());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment