diff --git a/statemachine.base/build.gradle b/statemachine.base/build.gradle index bf89dae982609fd55238deb529ebd469c6bf7055..2cce1f47f2acba40e3bbda748ab4e2588f8dd44f 100644 --- a/statemachine.base/build.gradle +++ b/statemachine.base/build.gradle @@ -62,8 +62,8 @@ jar { } } -def relastFiles = fileTree('src/main/jastadd/') { include '**/*.relast' } + - fileTree('src/gen/jastadd/') { include '**/*.relast' } +def ecoreFile = "./src/main/resources/StateMachine.ecore" +def relastFile = "./src/gen/jastadd/StateMachine.relast" String[] relastArguments = [ "../libs/relast.jar", "--grammarName=./src/gen/jastadd/StateMachine", @@ -73,8 +73,6 @@ String[] relastArguments = [ "--resolverHelper", "--file" ] -def ecoreFile = "./src/main/resources/StateMachine.ecore" -def relastFile = "./src/gen/jastadd/StateMachine.relast" task ecoreToRelast(type: JavaExec) { group = 'Build' @@ -96,9 +94,9 @@ task preprocess(type: JavaExec) { group = 'Build' main = "-jar" - args relastArguments + relastFiles + args relastArguments + relastFile - inputs.files relastFiles + inputs.files relastFile outputs.files file("./src/gen/jastadd/StateMachine.ast"), file("./src/gen/jastadd/StateMachine.jadd") }