Skip to content
Snippets Groups Projects
Commit fd9f3acf authored by René Schöne's avatar René Schöne
Browse files

Fix build of eraser-base

parent 6e14aaf1
No related branches found
No related tags found
1 merge request!19dev to master
build/
.gradle/
plugins { plugins {
id 'java' id 'eraser.java-common-conventions'
id 'jastadd' id 'java-library'
}
repositories {
mavenCentral()
} }
dependencies { dependencies {
implementation group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.2' api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
} }
...@@ -2,23 +2,21 @@ buildscript { ...@@ -2,23 +2,21 @@ buildscript {
repositories.mavenLocal() repositories.mavenLocal()
repositories.mavenCentral() repositories.mavenCentral()
dependencies { dependencies {
classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.2' classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
} }
} }
plugins { plugins {
id 'eraser.java-application-conventions' id 'eraser.java-application-conventions'
id 'java-library' id 'eraser.java-jastadd-conventions'
id 'com.github.ben-manes.versions'
id 'jacoco' id 'jacoco'
id 'distribution'
} }
apply plugin: 'jastadd' apply plugin: 'jastadd'
dependencies { dependencies {
jastadd2 "org.jastadd:jastadd:2.3.4"
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}" api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' api group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
implementation group: 'org.influxdb', name: 'influxdb-java', version: '2.15' implementation group: 'org.influxdb', name: 'influxdb-java', version: '2.15'
testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.11.2' testImplementation group: 'org.testcontainers', name: 'testcontainers', version: '1.11.2'
...@@ -26,7 +24,9 @@ dependencies { ...@@ -26,7 +24,9 @@ dependencies {
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
} }
application.mainClass = 'de.tudresden.inf.st.eraser.Main' application {
mainClass = 'de.tudresden.inf.st.eraser.Main'
}
test { test {
testLogging { testLogging {
...@@ -46,7 +46,7 @@ def relastFiles = fileTree('src/main/jastadd/') { ...@@ -46,7 +46,7 @@ def relastFiles = fileTree('src/main/jastadd/') {
include '**/*.relast' }.toList().toArray() include '**/*.relast' }.toList().toArray()
String[] relastArguments = [ String[] relastArguments = [
"libs/relast.jar", "libs/relast.jar",
"--grammarName=./src/main/jastadd/mainGen", "--grammarName=./src/gen/jastadd/mainGen",
"--useJastAddNames", "--useJastAddNames",
"--listClass=RefList", "--listClass=RefList",
"--jastAddList=JastAddList", "--jastAddList=JastAddList",
...@@ -58,15 +58,45 @@ task preprocess(type: JavaExec) { ...@@ -58,15 +58,45 @@ task preprocess(type: JavaExec) {
args relastArguments + relastFiles args relastArguments + relastFiles
inputs.files relastFiles inputs.files relastFiles
outputs.files file("./src/main/jastadd/mainGen.ast"), file("./src/main/jastadd/mainGen.jadd") outputs.files(file("./src/gen/jastadd/mainGen.ast"),
file("./src/gen/jastadd/mainGen.jadd"))
} }
jastadd { jastadd {
configureModuleBuild() configureModuleBuild()
modules "jastadd_modules" modules {
//noinspection GroovyAssignabilityCheck
module("eraser") {
java {
basedir "src/"
include "main/**/*.java"
include "gen/**/*.java"
}
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"
}
scanner {
include "src/main/jastadd/eraser.flex"
}
parser {
include "src/main/jastadd/eraser.parser"
}
}
}
module = "eraser" module = "eraser"
extraJastAddOptions = ['--List=JastAddList'] extraJastAddOptions = ["--lineColumnNumbers", "--List=JastAddList"]
astPackage = 'de.tudresden.inf.st.eraser.jastadd.model' astPackage = 'de.tudresden.inf.st.eraser.jastadd.model'
genDir = 'src/gen/java' genDir = 'src/gen/java'
......
module("eraser") {
java {
basedir "src/"
include "main/**/*.java"
include "gen/**/*.java"
}
jastadd {
basedir "src/main/jastadd/"
include "**/*.ast"
include "**/*.jadd"
include "**/*.jrag"
}
scanner {
include "src/main/jastadd/eraser.flex"
}
parser {
include "src/main/jastadd/eraser.parser"
}
}
mainGen.ast
mainGen.jadd
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment