From 7069150406068b405cae2b541859b4faee9d91c0 Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Thu, 28 Nov 2019 15:07:21 +0100 Subject: [PATCH] Fix build error. --- statemachine.base/build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/statemachine.base/build.gradle b/statemachine.base/build.gradle index bf89dae..2cce1f4 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") } -- GitLab