diff --git a/build.gradle b/build.gradle
index cec409ba6c2a313861e7d9d608a334bc3e19a1eb..43db1bf2bf8a91e168f83ca277f8716ee2ef343a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,12 +28,11 @@ buildscript {
idea.module.generatedSourceDirs += file('src/gen/java')
sourceSets.main.java.srcDir "src/gen/java"
-jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.pnml.splitter.Main')
+jar.manifest.attributes('Main-Class': 'de.tudresden.inf.st.pnml.Main')
configurations {
- // myBeaver
- pnmlRelastBaseClasspath
+ myBeaver
}
dependencies {
@@ -59,10 +58,7 @@ dependencies {
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
- pnmlRelastBaseClasspath fileTree(include: ['pnml-relast-base-0.1.jar'], dir: 'libs')
- // compile fileTree(include: ['pnml-relast-base-0.1.jar'], dir: './libs')
-
- // myBeaver group: 'net.sf.beaver', name: 'beaver-ant', version: '0.9.11'
+ myBeaver group: 'net.sf.beaver', name: 'beaver-ant', version: '0.9.11'
jastadd2 "org.jastadd:jastadd:2.3.4"
}
@@ -70,7 +66,7 @@ dependencies {
// Default run configuration
run {
- mainClassName = 'de.tudresden.inf.st.pnml.splitter.Main'
+ mainClassName = 'de.tudresden.inf.st.pnml.Main'
standardInput = System.in
}
@@ -81,7 +77,7 @@ def relastFile = "./src/gen/jastadd/pnml/placeTransition.relast"
jar {
manifest {
- attributes "Main-Class": "de.tudresden.inf.st.pnml.Main"
+ attributes "Main-Class": "de.tudresden.inf.st.pnml.splitter.Main"
}
from {
@@ -93,27 +89,12 @@ jar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- archiveBaseName = 'pnml-relast-splitter'
-
-}
-
-task pnmlRelastBase(type: JavaExec) {
- group = 'Build'
- // main = 'org.jastadd.ragconnect.compiler.Compiler'
- classpath = configurations.pnmlRelastBaseClasspath
-
- args([
- '--o=src/gen/jastadd',
- 'src/main/jastadd/MinimalModel.relast',
- 'src/main/jastadd/MinimalModel.connect',
- '--rootNode=A',
- '--protocols=ros'
- ])
+ archiveBaseName = 'pnml-splitter'
}
// First phase: Ecore -> RelAst
-/*task ecoreToRelast(type: JavaExec) {
+task ecoreToRelast(type: JavaExec) {
group = 'Build'
main = "-jar"
@@ -127,7 +108,7 @@ task pnmlRelastBase(type: JavaExec) {
inputs.files file(ecoreFile)
outputs.files file(relastFile), file(relastAspect)
-}*/
+}
// Second phase: RelAst -> JastAdd
task relastToJastAdd(type: JavaExec) {
@@ -141,20 +122,20 @@ task relastToJastAdd(type: JavaExec) {
"--jastAddList=JastAddList",
"--resolverHelper",
"--file",
- relastFile//,
- // "./src/main/jastadd/marking/Marking.relast",
- // "./src/main/jastadd/io/IoPN.relast",
- // "./src/main/jastadd/clauses/expressions.relast"
+ relastFile,
+ "../pnml-relast-base/src/main/jastadd/marking/Marking.relast",
+ "../pnml-relast-base/src/main/jastadd/io/IoPN.relast",
+ "../pnml-relast-base/src/main/jastadd/clauses/expressions.relast"
}
-/*task generateBeaver(type: JavaExec) {
+task generateBeaver(type: JavaExec) {
inputs.files {
- project.file("src/main/jastadd/clauses/Parser.beaver")
+ project.file("../pnml-relast-base/src/main/jastadd/clauses/Parser.beaver")
}
outputs.dir {
// This closure is needed to delay reading the genDir setting.
- project.file("src/gen/java/de/tudresden/inf/st/pnml/jastadd/parser")
+ project.file("../pnml-relast-base/src/gen/java/de/tudresden/inf/st/pnml/jastadd/parser")
}
classpath = configurations.myBeaver
@@ -165,10 +146,10 @@ task relastToJastAdd(type: JavaExec) {
if (!outdir.isDirectory()) {
outdir.mkdirs()
}
- def inputFile = project.file("src/main/jastadd/clauses/Parser.beaver")
+ def inputFile = project.file("../pnml-relast-base/src/main/jastadd/clauses/Parser.beaver")
args ([ '-d', outdir.path, '-t', '-c', '-w', inputFile.path ])
}
-}*/
+}
// Third phase: JastAdd -> Java (using JastAdd Gradle plugin)
jastadd {
@@ -187,22 +168,28 @@ jastadd {
}
jastadd {
- basedir "src/"
- include "main/jastadd/**/*.ast"
- include "main/jastadd/**/*.jadd"
- include "main/jastadd/**/*.jrag"
- include "gen/jastadd/**/*.ast"
- include "gen/jastadd/**/*.jadd"
- include "gen/jastadd/**/*.jrag"
+ include "src/main/jastadd/**/*.ast"
+ include "src/main/jastadd/**/*.jadd"
+ include "src/main/jastadd/**/*.jrag"
+ include "src/gen/jastadd/**/*.ast"
+ include "src/gen/jastadd/**/*.jadd"
+ include "src/gen/jastadd/**/*.jrag"
+
+ include "../pnml-relast-base/src/main/jastadd/**/*.ast"
+ include "../pnml-relast-base/src/main/jastadd/**/*.jadd"
+ include "../pnml-relast-base/src/main/jastadd/**/*.jrag"
+ include "../pnml-relast-base/src/gen/jastadd/**/*.ast"
+ include "../pnml-relast-base/src/gen/jastadd/**/*.jadd"
+ include "../pnml-relast-base/src/gen/jastadd/**/*.jrag"
}
scanner {
- // include "src/main/jastadd/PnmlScanner.flex"
- // include "src/main/jastadd/clauses/expressions.flex"
+ include "../pnml-relast-base/main/jastadd/PnmlScanner.flex"
+ include "../pnml-relast-base/jastadd/clauses/expressions.flex"
}
parser {
- // include "src/main/jastadd/PnmlParser.parser"
+ include "../pnml-relast-base/jastadd/PnmlParser.parser"
}
}
}
@@ -220,17 +207,16 @@ jastadd {
buildInfoDir = 'src/gen-res'
- scanner.genDir = "src/gen/java/de/tudresden/inf/st/pnml/splitter/jastadd/scanner"
- parser.genDir = "src/gen/java/de/tudresden/inf/st/pnml/splitter/jastadd/parser"
+ scanner.genDir = "src/gen/java/de/tudresden/inf/st/pnml/jastadd/scanner"
+ parser.genDir = "src/gen/java/de/tudresden/inf/st/pnml/jastadd/parser"
// default options are: '--rewrite=cnta', '--safeLazy', '--visitCheck=false', '--cacheCycle=false'
extraJastAddOptions = ['--List=JastAddList'] // '--incremental=param'
}
// Workflow configuration for phases
-//relastToJastAdd.dependsOn ecoreToRelast
-//generateAst.dependsOn relastToJastAdd
-// compileJava.dependsOn generateBeaver
+relastToJastAdd.dependsOn ecoreToRelast
+generateAst.dependsOn relastToJastAdd
+compileJava.dependsOn generateBeaver
//// always run jastadd
//jastadd.outputs.upToDateWhen {false}
-relastToJastAdd.dependsOn pnmlRelastBase
\ No newline at end of file
diff --git a/libs/pnml-relast-base-0.1.jar b/libs/pnml-relast-base-0.1.jar
deleted file mode 100644
index b9e5a207e1e925ec95047da80616328125b848e2..0000000000000000000000000000000000000000
Binary files a/libs/pnml-relast-base-0.1.jar and /dev/null differ
diff --git a/src/main/java/de/tudresden/inf/st/pnml/splitter/postprocessing/PostProcessingUtils.java b/src/main/java/de/tudresden/inf/st/pnml/splitter/postprocessing/PostProcessingUtils.java
index 855876686eb0e2a81bc9afa7b6ba5a997e9b9bde..e32e1d4ccb37421d8618100119bd9d2afd6928c3 100644
--- a/src/main/java/de/tudresden/inf/st/pnml/splitter/postprocessing/PostProcessingUtils.java
+++ b/src/main/java/de/tudresden/inf/st/pnml/splitter/postprocessing/PostProcessingUtils.java
@@ -4,7 +4,6 @@ import de.tudresden.inf.st.constants.PnmlConstants;
import de.tudresden.inf.st.pnml.splitter.copy.CopyPrimitiveElements;
import de.tudresden.inf.st.pnml.splitter.data.Tuple3;
import de.tudresden.inf.st.pnml.jastadd.model.*;
-import de.tudresden.inf.st.pnml.splitter.pnml.jastadd.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;