Commit 8eabc9f9 authored by René Schöne's avatar René Schöne
Browse files

Make multi-module again.

parent 8dade725
[submodule "relast-preprocessor"]
path = relast-preprocessor
url = ../relast-preprocessor.git
File added
apply plugin: 'java-library'
apply plugin: 'idea'
apply plugin: 'jastadd' apply plugin: 'jastadd'
apply plugin: 'application' apply plugin: 'application'
group = 'de.tudresden.inf.st'
sourceCompatibility = 1.8 sourceCompatibility = 1.8
targetCompatibility = 1.8
mainClassName = 'org.jastadd.ragconnect.compiler.Compiler' mainClassName = 'org.jastadd.ragconnect.compiler.Compiler'
repositories { repositories {
mavenCentral()
jcenter() jcenter()
} }
...@@ -17,9 +23,11 @@ buildscript { ...@@ -17,9 +23,11 @@ buildscript {
} }
dependencies { dependencies {
implementation project(':relast.preprocessor') implementation project(':relast-preprocessor')
implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.6' implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.11.2' implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.11.2'
implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.6'
runtime group: 'org.jastadd', name: 'jastadd', version: '2.3.4' runtime group: 'org.jastadd', name: 'jastadd', version: '2.3.4'
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
} }
...@@ -43,16 +51,8 @@ task newVersion() { ...@@ -43,16 +51,8 @@ task newVersion() {
} }
} }
sourceSets { sourceSets.main.java {
main { srcDir "src/gen/java"
java.srcDir "src/gen/java"
}
}
test {
useJUnitPlatform()
maxHeapSize = '1G'
} }
jar { jar {
...@@ -71,7 +71,7 @@ task relast(type: JavaExec) { ...@@ -71,7 +71,7 @@ task relast(type: JavaExec) {
args = [ args = [
"../libs/relast.jar", "../libs/relast.jar",
"../relast.preprocessor/src/main/jastadd/RelAst.relast", "../relast-preprocessor/src/main/jastadd/RelAst.relast",
"./src/main/jastadd/RagConnect.relast", "./src/main/jastadd/RagConnect.relast",
"./src/main/jastadd/MustacheNodes.relast", "./src/main/jastadd/MustacheNodes.relast",
"./src/main/jastadd/YAML.relast", "./src/main/jastadd/YAML.relast",
...@@ -84,7 +84,7 @@ task relast(type: JavaExec) { ...@@ -84,7 +84,7 @@ task relast(type: JavaExec) {
] ]
inputs.files("../libs/relast.jar", inputs.files("../libs/relast.jar",
"../relast.preprocessor/src/main/jastadd/RelAst.relast", "../relast-preprocessor/src/main/jastadd/RelAst.relast",
"./src/main/jastadd/RagConnect.relast", "./src/main/jastadd/RagConnect.relast",
"./src/main/jastadd/MustacheNodes.relast", "./src/main/jastadd/MustacheNodes.relast",
"./src/main/jastadd/YAML.relast") "./src/main/jastadd/YAML.relast")
...@@ -102,17 +102,17 @@ jastadd { ...@@ -102,17 +102,17 @@ jastadd {
java { java {
basedir ".." basedir ".."
include "relast.preprocessor/main/**/*.java" include "relast-preprocessor/main/**/*.java"
include "relast.preprocessor/gen/**/*.java" include "relast-preprocessor/gen/**/*.java"
include "ragconnect.base/src/main/**/*.java" include "ragconnect.base/src/main/**/*.java"
include "ragconnect.base/src/gen/**/*.java" include "ragconnect.base/src/gen/**/*.java"
} }
jastadd { jastadd {
basedir ".." basedir ".."
include "relast.preprocessor/src/main/jastadd/**/*.ast" include "relast-preprocessor/src/main/jastadd/**/*.ast"
include "relast.preprocessor/src/main/jastadd/**/*.jadd" include "relast-preprocessor/src/main/jastadd/**/*.jadd"
include "relast.preprocessor/src/main/jastadd/**/*.jrag" include "relast-preprocessor/src/main/jastadd/**/*.jrag"
include "ragconnect.base/src/main/jastadd/**/*.ast" include "ragconnect.base/src/main/jastadd/**/*.ast"
include "ragconnect.base/src/main/jastadd/**/*.jadd" include "ragconnect.base/src/main/jastadd/**/*.jadd"
include "ragconnect.base/src/main/jastadd/**/*.jrag" include "ragconnect.base/src/main/jastadd/**/*.jrag"
...@@ -124,22 +124,22 @@ jastadd { ...@@ -124,22 +124,22 @@ jastadd {
scanner { scanner {
basedir ".." basedir ".."
include "ragconnect.base/src/main/jastadd/scanner/Header.flex", [-5] include "ragconnect.base/src/main/jastadd/scanner/Header.flex", [-5]
include "relast.preprocessor/src/main/jastadd/scanner/Preamble.flex", [-4] include "relast-preprocessor/src/main/jastadd/scanner/Preamble.flex", [-4]
include "relast.preprocessor/src/main/jastadd/scanner/Macros.flex", [-3] include "relast-preprocessor/src/main/jastadd/scanner/Macros.flex", [-3]
include "ragconnect.base/src/main/jastadd/scanner/Macros.flex", [-3] include "ragconnect.base/src/main/jastadd/scanner/Macros.flex", [-3]
include "relast.preprocessor/src/main/jastadd/scanner/RulesPreamble.flex", [-2] include "relast-preprocessor/src/main/jastadd/scanner/RulesPreamble.flex", [-2]
include "ragconnect.base/src/main/jastadd/scanner/MappingContent.flex", [-1] include "ragconnect.base/src/main/jastadd/scanner/MappingContent.flex", [-1]
include "ragconnect.base/src/main/jastadd/scanner/Keywords.flex" include "ragconnect.base/src/main/jastadd/scanner/Keywords.flex"
include "relast.preprocessor/src/main/jastadd/scanner/Keywords.flex" include "relast-preprocessor/src/main/jastadd/scanner/Keywords.flex"
include "relast.preprocessor/src/main/jastadd/scanner/Symbols.flex", [1] include "relast-preprocessor/src/main/jastadd/scanner/Symbols.flex", [1]
include "relast.preprocessor/src/main/jastadd/scanner/RulesPostamble.flex", [2] include "relast-preprocessor/src/main/jastadd/scanner/RulesPostamble.flex", [2]
} }
parser { parser {
basedir ".." basedir ".."
include "ragconnect.base/src/main/jastadd/parser/Preamble.parser" include "ragconnect.base/src/main/jastadd/parser/Preamble.parser"
include "ragconnect.base/src/main/jastadd/parser/RagConnect.parser" include "ragconnect.base/src/main/jastadd/parser/RagConnect.parser"
include "relast.preprocessor/src/main/jastadd/parser/RelAst.parser" include "relast-preprocessor/src/main/jastadd/parser/RelAst.parser"
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment