From 0099ce1fc234049681ad442b1f86e67b19098fd5 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Mon, 11 Apr 2022 10:25:24 +0200
Subject: [PATCH] move marking aspects to subdirectory

---
 build.gradle                                  | 7 ++++++-
 gradle.properties                             | 2 +-
 src/main/jastadd/{ => marking}/Execution.jadd | 0
 src/main/jastadd/{ => marking}/Marking.jrag   | 0
 src/main/jastadd/{ => marking}/Marking.relast | 0
 src/main/jastadd/{ => marking}/Printing.jrag  | 0
 6 files changed, 7 insertions(+), 2 deletions(-)
 rename src/main/jastadd/{ => marking}/Execution.jadd (100%)
 rename src/main/jastadd/{ => marking}/Marking.jrag (100%)
 rename src/main/jastadd/{ => marking}/Marking.relast (100%)
 rename src/main/jastadd/{ => marking}/Printing.jrag (100%)

diff --git a/build.gradle b/build.gradle
index 4715433..b375652 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 c71e5b6..a6d0057 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
-- 
GitLab