improve gradle build. intellij analysis now works (thx René). task...

improve gradle build. intellij analysis now works (thx René). task dependencies might still be faulty.

trainbenchmark/settings.gradle

@@ -9,20 +9,20 @@ include ':trainbenchmark-generator-json4ag-special'
 include ':trainbenchmark-generator-relast'
 include ':trainbenchmark-generator-dot'
 include ':trainbenchmark-reporting'
-include ':trainbenchmark-scripts'
+//include ':trainbenchmark-scripts'
 include ':trainbenchmark-server'
 include ':trainbenchmark-tool'
 include ':trainbenchmark-tool-emf'
-include ':trainbenchmark-tool-jastadd-base'
+//include ':trainbenchmark-tool-jastadd-base'
 include ':trainbenchmark-tool-jastadd-namelookup'
-include ':trainbenchmark-tool-jastadd-namelookup-base'
+//include ':trainbenchmark-tool-jastadd-namelookup-base'
 include ':trainbenchmark-tool-jastadd-namelookup-incremental'
 include ':trainbenchmark-tool-jastadd-optimized'
-include ':trainbenchmark-tool-jastadd-optimized-base'
+//include ':trainbenchmark-tool-jastadd-optimized-base'
 include ':trainbenchmark-tool-jastadd-optimized-incremental'
 include ':trainbenchmark-tool-jastadd-specialized'
 include ':trainbenchmark-tool-jastadd-relast'
-include ':trainbenchmark-tool-jastadd-specialized-base'
+//include ':trainbenchmark-tool-jastadd-specialized-base'
 include ':trainbenchmark-tool-jastadd-specialized-incremental'
 include ':trainbenchmark-tool-jastadd-relast-incremental'
 include ':trainbenchmark-tool-tinkergraph'

trainbenchmark/trainbenchmark-alternate-scripts/build.gradle

@@ -10,15 +10,11 @@ dependencies {
 	compile project(':trainbenchmark-generator-relast')
 	compile project(':trainbenchmark-generator-dot')
 	compile project(':trainbenchmark-tool')
-	compile project(':trainbenchmark-tool-jastadd-base')
 	compile project(':trainbenchmark-tool-jastadd-namelookup')
-	compile project(':trainbenchmark-tool-jastadd-namelookup-base')
 	compile project(':trainbenchmark-tool-jastadd-namelookup-incremental')
 	compile project(':trainbenchmark-tool-jastadd-optimized')
-	compile project(':trainbenchmark-tool-jastadd-optimized-base')
 	compile project(':trainbenchmark-tool-jastadd-optimized-incremental')
 	compile project(':trainbenchmark-tool-jastadd-specialized')
-	compile project(':trainbenchmark-tool-jastadd-specialized-base')
 	compile project(':trainbenchmark-tool-jastadd-specialized-incremental')
 	compile project(':trainbenchmark-tool-jastadd-relast')
 	compile project(':trainbenchmark-tool-jastadd-relast-incremental')

trainbenchmark/trainbenchmark-scripts/build.gradle

@@ -10,15 +10,11 @@ dependencies {
 	compile project(':trainbenchmark-generator-relast')
 	compile project(':trainbenchmark-generator-dot')
 	compile project(':trainbenchmark-tool')
-	compile project(':trainbenchmark-tool-jastadd-base')
 	compile project(':trainbenchmark-tool-jastadd-namelookup')
-	compile project(':trainbenchmark-tool-jastadd-namelookup-base')
 	compile project(':trainbenchmark-tool-jastadd-namelookup-incremental')
 	compile project(':trainbenchmark-tool-jastadd-optimized')
-	compile project(':trainbenchmark-tool-jastadd-optimized-base')
 	compile project(':trainbenchmark-tool-jastadd-optimized-incremental')
 	compile project(':trainbenchmark-tool-jastadd-specialized')
-	compile project(':trainbenchmark-tool-jastadd-specialized-base')
 	compile project(':trainbenchmark-tool-jastadd-specialized-incremental')
 	compile project(':trainbenchmark-tool-jastadd-relast')
 	compile project(':trainbenchmark-tool-jastadd-relast-incremental')

trainbenchmark/trainbenchmark-tool-jastadd-namelookup-base/src/main/java-gen/.gitignore

-*
-!.gitignore

trainbenchmark/trainbenchmark-tool-jastadd-namelookup-incremental/.gitignore

+src/main/jastadd-gen
+src/main/java-gen
+src/main/java-include
\ No newline at end of file

trainbenchmark/trainbenchmark-tool-jastadd-namelookup-incremental/build.gradle

 plugins { id "com.github.johnrengelman.shadow" version "1.2.3" }
 
+apply plugin: 'idea'
+
+idea {
+    module {
+        generatedSourceDirs += file('src/main/java-include')
+    }
+}
+
+task copyFromBase(type: Copy) {
+    group = 'build'
+    description = 'Copy Java sources from base project'
+    from '../trainbenchmark-tool-jastadd-base/src/main/java'
+    from '../trainbenchmark-tool-jastadd-namelookup-base/src/main/java'
+    into 'src/main/java-include'
+}
+
 shadowJar {
     classifier = 'fat'
     manifest { attributes 'Main-Class': 'de.tudresden.inf.st.train.jastadd.JastaddBenchmarkMain' }
@@ -20,6 +36,7 @@ task jastadd(type: JavaExec) {
     ] + fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-namelookup-base/src/main/jastadd/")
     doFirst {
         delete fileTree('src/main/java-gen')
+        mkdir 'src/main/java-gen'
     }
 
     inputs.files fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-namelookup-base/src/main/jastadd/")
@@ -31,21 +48,25 @@ sourceSets {
         java {
             srcDir 'src/main/java'
             srcDir 'src/main/java-gen'
-            srcDir '../trainbenchmark-tool-jastadd-base/src/main/java'
-            srcDir '../trainbenchmark-tool-jastadd-namelookup-base/src/main/java'
+            srcDir 'src/main/java-include'
         }
     }
 }
 
 clean {
-    delete fileTree('src/main/java-gen')
+    delete 'src/main/java-gen'
+    delete 'src/main/jastadd-gen'
+    delete 'src/main/java-include'
 }
 
 dependencies {
     compile project(':trainbenchmark-tool')
-    compile project(':trainbenchmark-tool-jastadd-base')
-    compile project(':trainbenchmark-tool-jastadd-namelookup-base')
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
 }
 
+test {
+    outputs.upToDateWhen { false }
+}
+
 compileJava.dependsOn jastadd
+compileJava.dependsOn copyFromBase

trainbenchmark/trainbenchmark-tool-jastadd-namelookup-incremental/src/main/java-gen/.gitignore

-*
-!.gitignore

trainbenchmark/trainbenchmark-tool-jastadd-namelookup/.gitignore

+src/main/jastadd-gen
+src/main/java-gen
+src/main/java-include
\ No newline at end of file

trainbenchmark/trainbenchmark-tool-jastadd-namelookup/build.gradle

 plugins { id "com.github.johnrengelman.shadow" version "1.2.3" }
 
+apply plugin: 'idea'
+
+idea {
+    module {
+        generatedSourceDirs += file('src/main/java-include')
+    }
+}
+
+task copyFromBase(type: Copy) {
+    group = 'build'
+    description = 'Copy Java sources from base project'
+    from '../trainbenchmark-tool-jastadd-base/src/main/java'
+    from '../trainbenchmark-tool-jastadd-namelookup-base/src/main/java'
+    into 'src/main/java-include'
+}
+
 shadowJar {
     classifier = 'fat'
     manifest { attributes 'Main-Class': 'de.tudresden.inf.st.train.jastadd.JastaddBenchmarkMain' }
@@ -26,6 +42,7 @@ task jastadd(type: JavaExec) {
                 "--tracing=api",
         ] + fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-namelookup-base/src/main/jastadd/"))
         delete fileTree('src/main/java-gen')
+        mkdir 'src/main/java-gen'
     }
 
     inputs.files fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-namelookup-base/src/main/jastadd/")
@@ -37,21 +54,25 @@ sourceSets {
         java {
             srcDir 'src/main/java'
             srcDir 'src/main/java-gen'
-            srcDir '../trainbenchmark-tool-jastadd-base/src/main/java'
-            srcDir '../trainbenchmark-tool-jastadd-namelookup-base/src/main/java'
+            srcDir 'src/main/java-include'
         }
     }
 }
 
 clean {
-    delete fileTree('src/main/java-gen')
+    delete 'src/main/java-gen'
+    delete 'src/main/jastadd-gen'
+    delete 'src/main/java-include'
 }
 
 dependencies {
     compile project(':trainbenchmark-tool')
-    compile project(':trainbenchmark-tool-jastadd-base')
-    compile project(':trainbenchmark-tool-jastadd-namelookup-base')
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
 }
 
+test {
+    outputs.upToDateWhen { false }
+}
+
 compileJava.dependsOn jastadd
+compileJava.dependsOn copyFromBase

trainbenchmark/trainbenchmark-tool-jastadd-namelookup/src/main/java-gen/.gitignore

-*
-!.gitignore

trainbenchmark/trainbenchmark-tool-jastadd-optimized-base/src/main/java-gen/.gitignore

-*
-!.gitignore

trainbenchmark/trainbenchmark-tool-jastadd-optimized-incremental/.gitignore

+src/main/jastadd-gen
+src/main/java-gen
+src/main/java-include
\ No newline at end of file

trainbenchmark/trainbenchmark-tool-jastadd-optimized-incremental/build.gradle

 plugins { id "com.github.johnrengelman.shadow" version "1.2.3" }
 
+apply plugin: 'idea'
+
+idea {
+    module {
+        generatedSourceDirs += file('src/main/java-include')
+    }
+}
+
+task copyFromBase(type: Copy) {
+    group = 'build'
+    description = 'Copy Java sources from base project'
+    from '../trainbenchmark-tool-jastadd-base/src/main/java'
+    from '../trainbenchmark-tool-jastadd-optimized-base/src/main/java'
+    into 'src/main/java-include'
+}
+
 shadowJar {
     classifier = 'fat'
     manifest { attributes 'Main-Class': 'de.tudresden.inf.st.train.jastadd.JastaddBenchmarkMain' }
@@ -13,13 +29,14 @@ task jastadd(type: JavaExec) {
             "--cache=all",
             "--flush=full",
             "--incremental=param",
-            "--package=de.tudresden.inf.st.train.jastadd.ast",
             "--rewrite=cnta",
+            "--package=de.tudresden.inf.st.train.jastadd.ast",
             "--o=src/main/java-gen",
             "--tracing=api",
     ] + fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-optimized-base/src/main/jastadd/")
     doFirst {
         delete fileTree('src/main/java-gen')
+        mkdir 'src/main/java-gen'
     }
 
     inputs.files fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-optimized-base/src/main/jastadd/")
@@ -31,21 +48,25 @@ sourceSets {
         java {
             srcDir 'src/main/java'
             srcDir 'src/main/java-gen'
-            srcDir '../trainbenchmark-tool-jastadd-base/src/main/java'
-            srcDir '../trainbenchmark-tool-jastadd-optimized-base/src/main/java'
+            srcDir 'src/main/java-include'
         }
     }
 }
 
 clean {
-    delete fileTree('src/main/java-gen')
+    delete 'src/main/java-gen'
+    delete 'src/main/jastadd-gen'
+    delete 'src/main/java-include'
 }
 
 dependencies {
     compile project(':trainbenchmark-tool')
-    compile project(':trainbenchmark-tool-jastadd-base')
-    compile project(':trainbenchmark-tool-jastadd-optimized-base')
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
 }
 
+test {
+    outputs.upToDateWhen { false }
+}
+
 compileJava.dependsOn jastadd
+compileJava.dependsOn copyFromBase

trainbenchmark/trainbenchmark-tool-jastadd-optimized-incremental/src/main/java-gen/.gitignore

-*
-!.gitignore

trainbenchmark/trainbenchmark-tool-jastadd-optimized/.gitignore

+src/main/jastadd-gen
+src/main/java-gen
+src/main/java-include
\ No newline at end of file

trainbenchmark/trainbenchmark-tool-jastadd-optimized/build.gradle

 plugins { id "com.github.johnrengelman.shadow" version "1.2.3" }
 
+apply plugin: 'idea'
+
+idea {
+    module {
+        generatedSourceDirs += file('src/main/java-include')
+    }
+}
+
+task copyFromBase(type: Copy) {
+    group = 'build'
+    description = 'Copy Java sources from base project'
+    from '../trainbenchmark-tool-jastadd-base/src/main/java'
+    from '../trainbenchmark-tool-jastadd-optimized-base/src/main/java'
+    into 'src/main/java-include'
+}
+
 shadowJar {
     classifier = 'fat'
     manifest { attributes 'Main-Class': 'de.tudresden.inf.st.train.jastadd.JastaddBenchmarkMain' }
@@ -18,6 +34,7 @@ task jastadd(type: JavaExec) {
     ] + fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-optimized-base/src/main/jastadd/")
     doFirst {
         delete fileTree('src/main/java-gen')
+        mkdir 'src/main/java-gen'
     }
 
     inputs.files fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-optimized-base/src/main/jastadd/")
@@ -29,21 +46,25 @@ sourceSets {
         java {
             srcDir 'src/main/java'
             srcDir 'src/main/java-gen'
-            srcDir '../trainbenchmark-tool-jastadd-base/src/main/java'
-            srcDir '../trainbenchmark-tool-jastadd-optimized-base/src/main/java'
+            srcDir 'src/main/java-include'
         }
     }
 }
 
 clean {
-    delete fileTree('src/main/java-gen')
+    delete 'src/main/java-gen'
+    delete 'src/main/jastadd-gen'
+    delete 'src/main/java-include'
 }
 
 dependencies {
     compile project(':trainbenchmark-tool')
-    compile project(':trainbenchmark-tool-jastadd-base')
-    compile project(':trainbenchmark-tool-jastadd-optimized-base')
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
 }
 
+test {
+    outputs.upToDateWhen { false }
+}
+
 compileJava.dependsOn jastadd
+compileJava.dependsOn copyFromBase

trainbenchmark/trainbenchmark-tool-jastadd-optimized/src/main/java-gen/.gitignore

-*
-!.gitignore

trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/.gitignore

+src/main/jastadd-gen
+src/main/java-gen
+src/main/java-include
\ No newline at end of file

trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/build.gradle

 plugins { id "com.github.johnrengelman.shadow" version "1.2.3" }
 
+apply plugin: 'idea'
+
+idea {
+    module {
+        generatedSourceDirs += file('src/main/java-include')
+        generatedSourceDirs += file('src/main/java-gen')
+    }
+}
+
+task copyFromBase(type: Copy) {
+    group = 'build'
+    description = 'Copy Java sources from base project'
+    from '../trainbenchmark-tool-jastadd-base/src/main/java'
+    from '../trainbenchmark-tool-jastadd-specialized-base/src/main/java'
+    into 'src/main/java-include'
+}
+
 shadowJar {
     classifier = 'fat'
     manifest { attributes 'Main-Class': 'de.tudresden.inf.st.train.jastadd.JastaddBenchmarkMain' }
@@ -7,7 +24,8 @@ shadowJar {
 
 task preprocess(type: JavaExec) {
     doFirst {
-        delete fileTree('src/main/jastadd-gen')
+        delete 'src/main/jastadd-gen'
+        mkdir 'src/main/jastadd-gen'
     }
     group = 'Build'
     main = "-jar"
@@ -19,9 +37,22 @@ task preprocess(type: JavaExec) {
             "--grammarName=src/main/jastadd-gen/Train",
             "--file"
     ]
+
+    inputs.files "../trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/Train.relast"
+    outputs.files "src/main/jastadd-gen/Train.ast",
+            "src/main/jastadd-gen/Train.jadd",
+            "src/main/jastadd-gen/TrainRefResolver.jadd",
+            "src/main/jastadd-gen/TrainResolverStubs.jrag",
+            "src/main/jastadd-gen/TrainSerializer.jadd"
+
 }
 
 task jastadd(type: JavaExec) {
+    doFirst {
+        delete 'src/main/java-gen'
+        mkdir 'src/main/java-gen'
+    }
+
     group = 'Build'
     main = "-jar"
     args = [
@@ -33,18 +64,27 @@ task jastadd(type: JavaExec) {
             "--package=de.tudresden.inf.st.train.jastadd.ast",
             "--o=src/main/java-gen",
             "--tracing=api",
-    ] + fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("src/main/jastadd-gen/") + fileTree("../trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/").matching {exclude "*.relast"}
-    doFirst {
-        delete fileTree('src/main/java-gen')
-    }
+            "src/main/jastadd-gen/Train.ast",
+            "src/main/jastadd-gen/Train.jadd",
+            "src/main/jastadd-gen/TrainRefResolver.jadd",
+            "src/main/jastadd-gen/TrainResolverStubs.jrag",
+            "src/main/jastadd-gen/TrainSerializer.jadd"
+    ] + fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/").matching {exclude "*.relast"}
+
     doLast {
         ant.replaceregexp(match:'RefList extends List', replace:'RefList<T extends ASTNode> extends List<T>', flags:'g', byline:true) {
             fileset(dir: 'src/main/java-gen/de/tudresden/inf/st/train/jastadd/ast', includes: 'RefList.java')
         }
     }
 
-    inputs.files fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/") + fileTree("../trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/") + fileTree("src/main/jastadd-gen/")
-    outputs.files file("src/main/java-gen")
+    inputs.files "src/main/jastadd-gen/Train.ast",
+            "src/main/jastadd-gen/Train.jadd",
+            "src/main/jastadd-gen/TrainRefResolver.jadd",
+            "src/main/jastadd-gen/TrainResolverStubs.jrag",
+            "src/main/jastadd-gen/TrainSerializer.jadd",
+            fileTree("../trainbenchmark-tool-jastadd-base/src/main/jastadd/"),
+            fileTree("../trainbenchmark-tool-jastadd-specialized-base/src/main/jastadd/")
+    outputs.files "src/main/java-gen"
 }
 
 sourceSets {
@@ -52,20 +92,19 @@ sourceSets {
         java {
             srcDir 'src/main/java'
             srcDir 'src/main/java-gen'
-            srcDir '../trainbenchmark-tool-jastadd-base/src/main/java'
-            srcDir '../trainbenchmark-tool-jastadd-specialized-base/src/main/java'
+            srcDir 'src/main/java-include'
         }
     }
 }
 
-clean {
-    delete fileTree('src/main/java-gen')
+task cleanGen(type:Delete) {
+    delete "src/main/java-gen"
+    delete "src/main/jastadd-gen"
+    delete "src/main/java-include"
 }
 
 dependencies {
     compile project(':trainbenchmark-tool')
-    compile project(':trainbenchmark-tool-jastadd-base')
-    compile project(':trainbenchmark-tool-jastadd-specialized-base')
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
 }
 
@@ -73,5 +112,7 @@ test {
     outputs.upToDateWhen { false }
 }
 
+clean.dependsOn cleanGen
 jastadd.dependsOn preprocess
 compileJava.dependsOn jastadd
+compileJava.dependsOn copyFromBase
\ No newline at end of file

trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java-gen/.gitignore

-*
-!.gitignore