diff --git a/build.gradle b/build.gradle index 4715433d80cef61fae8b9f90c58eb3129e90ebf3..b375652328ff7b40d26c962a3d92a999b1fd1a75 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,10 @@ def jastaddGenSources = objects.sourceDirectorySet("resources", "Resources2") jastaddGenSources.srcDir 'src/gen' jastaddGenSources.include 'jastadd/*.relast', 'jastadd/*.ecore.jadd' +def jastaddInheritedSources = objects.sourceDirectorySet("resources", "Resources3") +jastaddInheritedSources.srcDir 'build/tmp/' +jastaddInheritedSources.include 'jastadd/**' + sourceSets { model { java { @@ -43,6 +47,7 @@ sourceSets { resources { source(jastaddSources) source(jastaddGenSources) + source(jastaddInheritedSources) } } test { @@ -111,7 +116,7 @@ test { // Generated files -def relastInputFiles = ['build/tmp/jastadd/placeTransition.relast', 'src/main/jastadd/Marking.relast'] +def relastInputFiles = ['build/tmp/jastadd/pnml/placeTransition.relast', 'src/main/jastadd/marking/Marking.relast'] def relastOutputFiles = ['src/gen/jastadd/placeTransition.ast', 'src/gen/jastadd/placeTransition.jadd'] task extractJastAddSources(type: Sync) { diff --git a/gradle.properties b/gradle.properties index c71e5b67c2b8f5607e5d0514903324317ba1d626..a6d0057a1a41bea5efabd6b752b3aaf825d48067 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ relast_version = 0.3.0-137 jastaddgradle_version = 1.14.5 -pnml_relast_version = 0.4.0-5 \ No newline at end of file +pnml_relast_version = 0.4.0-6 \ No newline at end of file diff --git a/src/main/jastadd/Execution.jadd b/src/main/jastadd/marking/Execution.jadd similarity index 100% rename from src/main/jastadd/Execution.jadd rename to src/main/jastadd/marking/Execution.jadd diff --git a/src/main/jastadd/Marking.jrag b/src/main/jastadd/marking/Marking.jrag similarity index 100% rename from src/main/jastadd/Marking.jrag rename to src/main/jastadd/marking/Marking.jrag diff --git a/src/main/jastadd/Marking.relast b/src/main/jastadd/marking/Marking.relast similarity index 100% rename from src/main/jastadd/Marking.relast rename to src/main/jastadd/marking/Marking.relast diff --git a/src/main/jastadd/Printing.jrag b/src/main/jastadd/marking/Printing.jrag similarity index 100% rename from src/main/jastadd/Printing.jrag rename to src/main/jastadd/marking/Printing.jrag