From d88bedb706cb78489fc38a24b64cea05a85f4ae5 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Wed, 25 Sep 2019 13:29:07 +0200
Subject: [PATCH] Improved generateSVGs task etc.

---
 build.gradle                                  | 24 ++++++++++++++-----
 gradle.properties                             |  8 +++++++
 .../gen/DiplomaticConversion.java             |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index cee66cc..d686265 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,10 @@ plugins {
 }
 
 
-def architecture = "linux-x86_64"   // TODO make adjustable
-def toolDir = "$buildDir/tools"
+ext.architecture = "linux-x86_64"   // TODO make adjustable
+ext.toolDir = "$buildDir/tools"
+ext.dataDir = file('data', PathValidation.DIRECTORY)
+
 
 
 group = 'net.faustedition'
@@ -50,8 +52,8 @@ dependencies {
     implementation 'com.google.guava:guava-collections:r03'
     implementation 'com.xmlcalabash:xmlcalabash:1.1.13-96'
 
-    tools 'slimerjs:slimerjs:1.0.0-beta.1@tar.bz2'
-    tools 'org.mozilla:firefox:57.0.4@tar.bz2'
+    tools 'slimerjs:slimerjs:1.0.0@tar.bz2'
+    tools 'org.mozilla:firefox:59.0@tar.bz2'
 
     testCompile 'junit:junit:4.12'
 }
@@ -68,15 +70,25 @@ task generateSVGs(type: JavaExec) {
     dependsOn getTools
     dependsOn classes
 
+    inputs.dir("$dataDir/xml/transcript")
+    outputs.dir("$buildDir/www/transcript")
+
     environment 'LANG', 'en_US.UTF-8'
     environment 'LC_ALL', 'en_US.UTF-8'
     environment 'SLIMERJSLAUNCHER', "$toolDir/firefox/firefox"
 
     systemProperties([
-            'phantomjs.binary': "$toolDir/slimerjs-1.0.0-beta.1/slimerjs",
-    ])
+            'phantomjs.binary': "$toolDir/slimerjs-1.0.0/slimerjs" ,
+            'faust.diplo.target': buildDir
+        ])
+    systemProperties(project.properties.findAll {key, value -> key.matches('^faust\\.diplo\\.')})
 
     classpath sourceSets.main.runtimeClasspath
     main 'net.faustedition.gen.DiplomaticConversion'
 }
+build.dependsOn generateSVGs
+
 
+task showProps { doLast {
+    project.properties.each { key, value -> println "$key=$value"}
+}}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..1777be4
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,8 @@
+org.gradle.jvmargs=-Xmx4G -XX:MaxPermSize=2G -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+
+upload.url=beta.faustedition.net:/var/www/dev
+faust.diplo.allowedFailures=10
+faust.diplo.port=0
+faust.diplo.debug=0
+exist.app-name=faust-dev
\ No newline at end of file
diff --git a/src/main/java/net/faustedition/gen/DiplomaticConversion.java b/src/main/java/net/faustedition/gen/DiplomaticConversion.java
index baf65a8..25e5310 100644
--- a/src/main/java/net/faustedition/gen/DiplomaticConversion.java
+++ b/src/main/java/net/faustedition/gen/DiplomaticConversion.java
@@ -60,7 +60,7 @@ public class DiplomaticConversion {
 	private static Logger logger = Logger.getLogger(DiplomaticConversion.class.getName());
 
 	public static Path root = Paths.get(System.getProperty("faust.diplo.root", "data/xml/"));
-	public static Path target = Paths.get("target");
+	public static Path target = Paths.get(System.getProperty("faust.diplo.target", "target"));
 
 	private static final Path prepared_svg = target.resolve(System.getProperty("faust.diplo.prepared-svg", "prepared-svg"));
 	public static Path profile = target.resolve("profile");