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

Include RagConnect aspects automatically, 0.2.8

parent cc82b5da
No related branches found
No related tags found
No related merge requests found
Pipeline #9492 passed
...@@ -4,7 +4,7 @@ plugins { ...@@ -4,7 +4,7 @@ plugins {
} }
group 'org.jastadd.preprocessor' group 'org.jastadd.preprocessor'
version '0.2.7' version '0.2.8'
gradlePlugin { gradlePlugin {
plugins { plugins {
......
...@@ -37,6 +37,7 @@ public interface JastAddConfiguration { ...@@ -37,6 +37,7 @@ public interface JastAddConfiguration {
return getExtraOptions() != null ? getExtraOptions() : Collections.emptyList(); return getExtraOptions() != null ? getExtraOptions() : Collections.emptyList();
} }
@Optional
@InputFiles @InputFiles
List<File> getInputFiles(); List<File> getInputFiles();
void setInputFiles(List<File> inputFiles); void setInputFiles(List<File> inputFiles);
......
...@@ -18,6 +18,14 @@ public interface RagConnectConfiguration { ...@@ -18,6 +18,14 @@ public interface RagConnectConfiguration {
String getRootNode(); String getRootNode();
void setRootNode(String rootNode); void setRootNode(String rootNode);
@Input
String getOutputDir();
void setOutputDir(String outputDir);
@InputFiles
List<File> getInputFiles();
void setInputFiles(List<File> inputFiles);
@Optional @Optional
@Input @Input
boolean isLogReads(); boolean isLogReads();
...@@ -28,10 +36,6 @@ public interface RagConnectConfiguration { ...@@ -28,10 +36,6 @@ public interface RagConnectConfiguration {
boolean isLogWrites(); boolean isLogWrites();
void setLogWrites(boolean logWrites); void setLogWrites(boolean logWrites);
@Input
String getOutputDir();
void setOutputDir(String outputDir);
@Optional @Optional
@Input @Input
boolean isVerbose(); boolean isVerbose();
...@@ -41,8 +45,4 @@ public interface RagConnectConfiguration { ...@@ -41,8 +45,4 @@ public interface RagConnectConfiguration {
@Input @Input
List<String> getProtocols(); List<String> getProtocols();
void setProtocols(List<String> protocols); void setProtocols(List<String> protocols);
@InputFiles
List<File> getInputFiles();
void setInputFiles(List<File> inputFiles);
} }
...@@ -123,6 +123,16 @@ public abstract class RagConnectTest extends RelastTest { ...@@ -123,6 +123,16 @@ public abstract class RagConnectTest extends RelastTest {
// now run relast + jastadd // now run relast + jastadd
getRelast().setInputFiles(grammarFilesGeneratedByRagconnect()); getRelast().setInputFiles(grammarFilesGeneratedByRagconnect());
if (getJastadd().getInputFiles() == null) {
getJastadd().setInputFiles(new ArrayList<>());
}
for (File file : aspectFilesGeneratedByRagconnect()) {
if (getJastadd().getInputFiles().contains(file)) {
getLogger().warn("Input file to JastAdd already known: {} - Remove from jastadd.inputFiles!", file);
} else {
getJastadd().getInputFiles().add(file);
}
}
super.runTest(); super.runTest();
} }
} }
...@@ -13,6 +13,8 @@ import java.util.List; ...@@ -13,6 +13,8 @@ import java.util.List;
* @author rschoene - Initial contribution * @author rschoene - Initial contribution
*/ */
public interface RelastConfiguration { public interface RelastConfiguration {
@Optional
@Input @Input
boolean isUseJastAddNames(); boolean isUseJastAddNames();
void setUseJastAddNames(boolean useJastAddNames); void setUseJastAddNames(boolean useJastAddNames);
...@@ -21,18 +23,20 @@ public interface RelastConfiguration { ...@@ -21,18 +23,20 @@ public interface RelastConfiguration {
String getGrammarName(); String getGrammarName();
void setGrammarName(String grammarName); void setGrammarName(String grammarName);
@InputFiles
@Optional @Optional
@InputFiles
List<File> getInputFiles(); List<File> getInputFiles();
void setInputFiles(List<File> inputFiles); void setInputFiles(List<File> inputFiles);
@Optional
@Input @Input
boolean isWriteToFile(); // = true; boolean isNoWriteToFile();
void setWriteToFile(boolean writeToFile); void setNoWriteToFile(boolean noWriteToFile);
@Optional
@Input @Input
boolean isResolverHelper(); // = true; boolean isNoResolverHelper();
void setResolverHelper(boolean resolverHelper); void setNoResolverHelper(boolean noResolverHelper);
@Optional @Optional
@Input @Input
...@@ -44,7 +48,8 @@ public interface RelastConfiguration { ...@@ -44,7 +48,8 @@ public interface RelastConfiguration {
String getSerializer(); String getSerializer();
void setSerializer(String serializer); void setSerializer(String serializer);
@Optional
@Input @Input
boolean isVerbose(); // = false; boolean isVerbose();
void setVerbose(boolean verbose); void setVerbose(boolean verbose);
} }
...@@ -108,13 +108,13 @@ public abstract class RelastTest extends DefaultTask { ...@@ -108,13 +108,13 @@ public abstract class RelastTest extends DefaultTask {
args.add(file.getAbsolutePath()); args.add(file.getAbsolutePath());
} }
args.add("--quiet"); args.add("--quiet");
if (getRelast().isWriteToFile()) { if (!getRelast().isNoWriteToFile()) {
args.add("--file"); args.add("--file");
} }
if (getRelast().isUseJastAddNames()) { if (getRelast().isUseJastAddNames()) {
args.add("--useJastAddNames"); args.add("--useJastAddNames");
} }
if (getRelast().isResolverHelper()) { if (!getRelast().isNoResolverHelper()) {
args.add("--resolverHelper"); args.add("--resolverHelper");
} }
if (getJastadd().getJastAddList() != null) { if (getJastadd().getJastAddList() != null) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment