begin with making variants explicit

cp-to-solution.sh

@@ -64,7 +64,7 @@ function build() {
 
 function prepare_namelookup() {
   # deactivate preprocess
-  sed -i 's|^jastadd.dependsOn preprocess|//jastadd.dependsOn preprocess|g' solve/build.gradle
+  sed -i 's|^generateAst.dependsOn preprocess|//generateAst.dependsOn preprocess|g' solve/build.gradle
   # remove generated AST and helper files, activate namelookup AST and helper jadd files
   ( cd solve/src/main/jastadd &&
     rm SocialNetworkGen.ast SocialNetworkGen.jadd &&
@@ -74,7 +74,7 @@ function prepare_namelookup() {
 
 function revert_namelookup() {
   # activate preprocess
-  sed -i 's|//jastadd.dependsOn preprocess|jastadd.dependsOn preprocess|g' solve/build.gradle
+  sed -i 's|//generateAst.dependsOn preprocess|generateAst.dependsOn preprocess|g' solve/build.gradle
   # deactivate normal AST and helper jadd files
   ( cd solve/src/main/jastadd &&
     mv Refs.jadd Refs.jadd.unused &&

namelookup-xml-flush/.gitignore

+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd

namelookup-xml-flush/build.gradle

+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-flush.gradle'
+
+apply from: '../solve/gradle-parts/rel-namelookup.gradle'

namelookup-xml-flush/jastadd_modules

+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "main/namelookup-jastadd/**/*.jadd"
+        include "main/namelookup-jastadd/**/*.ast"
+    }
+}

namelookup-xml-flush/libs

+../solve/libs
\ No newline at end of file

namelookup-xml-flush/src/main

+../../solve/src/main
\ No newline at end of file

namelookup-xml-flush/src/test

+../../solve/src/test
\ No newline at end of file

namelookup-xml-inc/.gitignore

+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd

namelookup-xml-inc/build.gradle

+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-incremental.gradle'
+
+apply from: '../solve/gradle-parts/rel-namelookup.gradle'

namelookup-xml-inc/jastadd_modules

+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "main/namelookup-jastadd/**/*.jadd"
+        include "main/namelookup-jastadd/**/*.ast"
+    }
+}

namelookup-xml-inc/libs

+../solve/libs
\ No newline at end of file

namelookup-xml-inc/src/main

+../../solve/src/main
\ No newline at end of file

namelookup-xml-inc/src/test

+../../solve/src/test
\ No newline at end of file

relast-xml-flush/.gitignore

+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd

relast-xml-flush/build.gradle

+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+apply from: '../solve/gradle-parts/base.gradle'
+
+apply from: '../solve/gradle-parts/inc-flush.gradle'
+
+apply from: '../solve/gradle-parts/rel-relast.gradle'

relast-xml-flush/jastadd_modules

+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/**/*.ast"
+        include "main/jastadd/**/*.jadd"
+        include "main/jastadd/**/*.jrag"
+        include "gen/jastadd/**/*.ast"
+        include "gen/jastadd/**/*.jadd"
+    }
+}

relast-xml-flush/libs

+../solve/libs
\ No newline at end of file

relast-xml-flush/src/main

+../../solve/src/main
\ No newline at end of file

relast-xml-flush/src/test

+../../solve/src/test
\ No newline at end of file

relast-xml-inc/.gitignore

+/src/gen/
+/src/gen-res/
+/build/
+events.txt
+/src/main/jastadd/SocialNetworkGen.ast
+/src/main/jastadd/SocialNetworkGen.jadd