Skip to content
Snippets Groups Projects
Commit f9f10bc7 authored by Johannes Mey's avatar Johannes Mey
Browse files

cleanup build file

parent 9f219c93
No related branches found
No related tags found
No related merge requests found
Pipeline #13326 passed
plugins { plugins {
id 'java-library' id 'java-library'
id 'org.jastadd' version "${jastaddgradle_version}" id 'org.jastadd' version "${jastaddgradle_version}"
id 'java'
id 'idea' id 'idea'
id 'maven-publish' id 'maven-publish'
} }
...@@ -27,13 +26,13 @@ configurations { ...@@ -27,13 +26,13 @@ configurations {
sourceSets { sourceSets {
model { model {
java { java {
srcDir "src/gen/java" srcDir 'src/gen/java'
} }
} }
main { main {
compileClasspath += sourceSets.model.output compileClasspath += sourceSets.model.output
resources { resources {
srcDir "src/main/jastadd" srcDir 'src/main/jastadd'
} }
} }
test { test {
...@@ -42,7 +41,7 @@ sourceSets { ...@@ -42,7 +41,7 @@ sourceSets {
} }
} }
File genSrc = file("src/gen/java") File genSrc = file('src/gen/java')
idea.module.generatedSourceDirs += genSrc idea.module.generatedSourceDirs += genSrc
def versionFile = 'src/main/resources/PnmlRelAstVersion.properties' def versionFile = 'src/main/resources/PnmlRelAstVersion.properties'
...@@ -80,7 +79,7 @@ task setDevVersionForCI() { ...@@ -80,7 +79,7 @@ task setDevVersionForCI() {
dependencies { dependencies {
modelImplementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' modelRuntimeOnly group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
modelImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30' modelImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
modelImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30' modelImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
...@@ -89,8 +88,6 @@ dependencies { ...@@ -89,8 +88,6 @@ dependencies {
api group: 'org.jastadd', name: 'jastadd', version: '2.3.5' api group: 'org.jastadd', name: 'jastadd', version: '2.3.5'
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
// implementation group: 'com.github.jknack', name: 'handlebars', version: '4.3.0'
// implementation group: 'org.yaml', name: 'snakeyaml', version: '1.27'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30' implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30' implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
...@@ -102,8 +99,8 @@ dependencies { ...@@ -102,8 +99,8 @@ dependencies {
implementation group: 'fr.lip6.pnml', name: 'fr.lip6.pnml.framework.ptnet', version: '2.2.12' implementation group: 'fr.lip6.pnml', name: 'fr.lip6.pnml.framework.ptnet', version: '2.2.12'
implementation group: 'fr.lip6.pnml', name: 'fr.lip6.pnml.framework.utils', version: '2.2.12' implementation group: 'fr.lip6.pnml', name: 'fr.lip6.pnml.framework.utils', version: '2.2.12'
implementation group: 'org.apache.ws.commons.axiom', name: 'axiom-api', version: '1.2.22' implementation group: 'org.apache.ws.commons.axiom', name: 'axiom-api', version: '1.2.22'
implementation group: 'org.apache.ws.commons.axiom', name: 'axiom-impl', version: '1.2.22' runtimeOnly group: 'org.apache.ws.commons.axiom', name: 'axiom-impl', version: '1.2.22'
implementation group: 'com.thaiopensource', name: 'jing', version: '20091111' runtimeOnly group: 'com.thaiopensource', name: 'jing', version: '20091111'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'
...@@ -112,7 +109,7 @@ dependencies { ...@@ -112,7 +109,7 @@ dependencies {
} }
jar { jar {
archiveAppendix = "base" archiveAppendix = 'base'
} }
test { test {
...@@ -120,16 +117,16 @@ test { ...@@ -120,16 +117,16 @@ test {
} }
// Generated files // Generated files
def ecoreFile = "./src/main/resources/placeTransition.ecore" def ecoreFile = './src/main/resources/placeTransition.ecore'
def ecoreRelastAspect = "./src/gen/jastadd/placeTransition.ecore.jadd" def ecoreRelastAspect = './src/gen/jastadd/placeTransition.ecore.jadd'
def ecoreRelastGrammar = "./src/gen/jastadd/placeTransition.relast" def ecoreRelastGrammar = './src/gen/jastadd/placeTransition.relast'
def ecoreInputFiles = [ecoreFile] def ecoreInputFiles = [ecoreFile]
def ecoreOutputFiles = [ecoreRelastAspect, def ecoreOutputFiles = [ecoreRelastAspect,
ecoreRelastGrammar] ecoreRelastGrammar]
def relastInputFiles = [ecoreRelastGrammar, "src/main/jastadd/marking/Marking.relast"] def relastInputFiles = [ecoreRelastGrammar, 'src/main/jastadd/marking/Marking.relast']
def relastOutputFiles = ["src/gen/jastadd/placeTransition.ast", "src/gen/jastadd/placeTransition.jadd"] def relastOutputFiles = ['src/gen/jastadd/placeTransition.ast', 'src/gen/jastadd/placeTransition.jadd']
// First phase: Ecore -> RelAst // First phase: Ecore -> RelAst
task ecoreToRelast(type: JavaExec) { task ecoreToRelast(type: JavaExec) {
...@@ -139,7 +136,7 @@ task ecoreToRelast(type: JavaExec) { ...@@ -139,7 +136,7 @@ task ecoreToRelast(type: JavaExec) {
doFirst { doFirst {
delete ecoreOutputFiles delete ecoreOutputFiles
mkdir "src/gen/jastadd" mkdir 'src/gen/jastadd'
} }
args ecoreFile, ecoreRelastGrammar args ecoreFile, ecoreRelastGrammar
...@@ -164,7 +161,7 @@ task relastToJastAdd(type: JavaExec) { ...@@ -164,7 +161,7 @@ task relastToJastAdd(type: JavaExec) {
"--listClass=ArrayList", "--listClass=ArrayList",
"--jastAddList=JastAddList", "--jastAddList=JastAddList",
"--resolverHelper", "--resolverHelper",
"--file" '--file'
args relastInputFiles args relastInputFiles
inputs.files relastInputFiles inputs.files relastInputFiles
...@@ -175,33 +172,33 @@ task relastToJastAdd(type: JavaExec) { ...@@ -175,33 +172,33 @@ task relastToJastAdd(type: JavaExec) {
jastadd { jastadd {
configureModuleBuild() configureModuleBuild()
modules { modules {
module("pnml") { module('pnml') {
jastadd { jastadd {
include "src/main/jastadd/**/*.ast" include 'src/main/jastadd/**/*.ast'
include "src/main/jastadd/**/*.jadd" include 'src/main/jastadd/**/*.jadd'
include "src/main/jastadd/**/*.jrag" include 'src/main/jastadd/**/*.jrag'
include "src/gen/jastadd/**/*.ast" include 'src/gen/jastadd/**/*.ast'
include "src/gen/jastadd/**/*.jadd" include 'src/gen/jastadd/**/*.jadd'
include "src/gen/jastadd/**/*.jrag" include 'src/gen/jastadd/**/*.jrag'
} }
scanner { scanner {
include "src/main/jastadd/PnmlScanner.flex" include 'src/main/jastadd/PnmlScanner.flex'
} }
parser { parser {
include "src/main/jastadd/PnmlParser.parser" include 'src/main/jastadd/PnmlParser.parser'
} }
} }
} }
cleanGen.doFirst { cleanGen.doFirst {
delete "src/gen" delete 'src/gen'
delete "src/gen-res" delete 'src/gen-res'
} }
module = "pnml" module = 'pnml'
astPackage = 'de.tudresden.inf.st.pnml.jastadd.model' astPackage = 'de.tudresden.inf.st.pnml.jastadd.model'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment