diff --git a/build.gradle b/build.gradle index 99e03325eddcbf65a405359399fb5b1183e61160..1087eacb8a63191dab9041ae29f70d2aea78bd34 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ jastaddSources.include 'jastadd/**' def jastaddGenSources = objects.sourceDirectorySet("resources", "Resources2") jastaddGenSources.srcDir 'src/gen' -jastaddGenSources.include 'jastadd/*.relast', 'jastadd/*.ecore.jadd' +jastaddGenSources.include 'jastadd/pnml/*.relast', 'jastadd/pnml/*.ecore.jadd' sourceSets { model { @@ -129,15 +129,15 @@ test { // Generated files def ecoreFile = './src/main/resources/placeTransition.ecore' -def ecoreRelastAspect = './src/gen/jastadd/placeTransition.ecore.jadd' -def ecoreRelastGrammar = './src/gen/jastadd/placeTransition.relast' +def ecoreRelastAspect = './src/gen/jastadd/pnml/placeTransition.ecore.jadd' +def ecoreRelastGrammar = './src/gen/jastadd/pnml/placeTransition.relast' def ecoreInputFiles = [ecoreFile] def ecoreOutputFiles = [ecoreRelastAspect, ecoreRelastGrammar] def relastInputFiles = [ecoreRelastGrammar] -def relastOutputFiles = ['src/gen/jastadd/placeTransition.ast', 'src/gen/jastadd/placeTransition.jadd'] +def relastOutputFiles = ['src/gen/jastadd/pnml/placeTransition.ast', 'src/gen/jastadd/pnml/placeTransition.jadd'] // First phase: Ecore -> RelAst task ecoreToRelast(type: JavaExec) { @@ -168,7 +168,7 @@ task relastToJastAdd(type: JavaExec) { } args "--useJastAddNames", - "--grammarName=src/gen/jastadd/placeTransition", + "--grammarName=src/gen/jastadd/pnml/placeTransition", "--listClass=java.util.ArrayList", "--jastAddList=JastAddList", "--resolverHelper", diff --git a/src/main/jastadd/Constraints.jrag b/src/main/jastadd/pnml/Constraints.jrag similarity index 100% rename from src/main/jastadd/Constraints.jrag rename to src/main/jastadd/pnml/Constraints.jrag diff --git a/src/main/jastadd/Graphviz.jrag b/src/main/jastadd/pnml/Graphviz.jrag similarity index 100% rename from src/main/jastadd/Graphviz.jrag rename to src/main/jastadd/pnml/Graphviz.jrag diff --git a/src/main/jastadd/Navigation.jrag b/src/main/jastadd/pnml/Navigation.jrag similarity index 100% rename from src/main/jastadd/Navigation.jrag rename to src/main/jastadd/pnml/Navigation.jrag diff --git a/src/main/jastadd/Printing.jrag b/src/main/jastadd/pnml/Printing.jrag similarity index 100% rename from src/main/jastadd/Printing.jrag rename to src/main/jastadd/pnml/Printing.jrag diff --git a/src/main/jastadd/References.jrag b/src/main/jastadd/pnml/References.jrag similarity index 100% rename from src/main/jastadd/References.jrag rename to src/main/jastadd/pnml/References.jrag diff --git a/src/main/jastadd/Util.jadd b/src/main/jastadd/pnml/Util.jadd similarity index 100% rename from src/main/jastadd/Util.jadd rename to src/main/jastadd/pnml/Util.jadd