From 69de1b933246dc92e73d3b1713f3c394bc477d50 Mon Sep 17 00:00:00 2001
From: Thorsten Vitt <thorsten.vitt@uni-wuerzburg.de>
Date: Thu, 3 Oct 2019 18:54:12 +0200
Subject: [PATCH] converted eXist properties to be gradle compatible

---
 build.gradle      | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 gradle.properties |  2 +-
 pom.xml           |  8 ++++----
 src/main/xproc    |  2 +-
 4 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index fbf4de8..ffbaa32 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,6 @@
+import org.apache.tools.ant.filters.*
+
+
 plugins {
     id 'base'
     id 'java'
@@ -112,7 +115,48 @@ task generateSVGs(type: JavaExec) {
     main 'net.faustedition.gen.DiplomaticConversion'
 }
 
-assemble.dependsOn generateSVGs, copyWeb, copySource
+task xar(type: Zip) {
+    description "Assembles the eXist app for the search part"
+    group "Generate HTML"
+    dependsOn 'src:main:xproc:generateSearch'
+    dependsOn 'src:main:xproc:testimony'
+    dependsOn 'src:main:xproc:metadataHtml'
+    dependsOn 'src:main:xproc:bibliography'
+    dependsOn copyWeb
+    archiveFileName = "${existAppName}.xar" // FIXME property
+    destinationDir = buildDir
+    from(project.file('src/main/xproc/exist')) {
+        include "*.xql"
+        include "*.xqm"
+        include "*.xconf"
+        include "build.xml"
+        include "config/**/*"
+    }
+    from(project.file('src/main/xproc/exist')) {
+        include "*.xml"
+        exclude "build.xml"
+        expand(project.properties)
+    }
+    from(project.file('src/main/xproc/xslt')) {
+        include '*.xsl'
+        include '*.xml'
+        into 'xslt'
+    }
+    from("$buildDir/search") {
+        include '**/*'
+        into 'data'
+    }
+    from(project.file('src/main/web/content')) {
+        include '**/*'
+        into 'data/info'
+    }
+    from("$buildDir/www") {
+        include 'bibliography.html'
+        into 'data/info'
+    }
+}
+
+assemble.dependsOn generateSVGs, copyWeb, copySource, xar
 
 
 task showProps { doLast {
diff --git a/gradle.properties b/gradle.properties
index 1777be4..8e4c5a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,4 +5,4 @@ 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
+existAppName=faust-dev
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5e4cf9d..d13f386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 		<faust.diplo.server>false</faust.diplo.server> <!-- Run only the web server, don't actually convert -->
 		<faust.diplo.port>0</faust.diplo.port> <!-- Specify port for server, default to auto -->
 		<faust.diplo.debug>false</faust.diplo.debug>   <!-- Debug phantomjs, produces massive output -->
-		<exist.app-name>faust-dev</exist.app-name>
+		<existAppName>faust-dev</existAppName>
 	</properties>
 
 	<repositories>
@@ -189,7 +189,7 @@
 						<goals><goal>single</goal></goals>
 						<configuration>
 							<descriptor>${basedir}/src/main/assembly/exist-app.xml</descriptor>
-							<finalName>${exist.app-name}</finalName>
+							<finalName>${existAppName}</finalName>
 							<appendAssemblyId>false</appendAssemblyId>
 							<attach>false</attach>
 						</configuration>
@@ -208,8 +208,8 @@
 						<goals><goal>run</goal></goals>
 						<configuration>
 							<target>
-								<move file="${project.build.directory}/${exist.app-name}.zip" 
-									tofile="${project.build.directory}/${exist.app-name}.xar"/>
+								<move file="${project.build.directory}/${existAppName}.zip"
+									tofile="${project.build.directory}/${existAppName}.xar"/>
 							</target>
 						</configuration>
 					</execution>
diff --git a/src/main/xproc b/src/main/xproc
index 10d3599..4b71369 160000
--- a/src/main/xproc
+++ b/src/main/xproc
@@ -1 +1 @@
-Subproject commit 10d359908d37ccf321336f39b97c5ff6777e6dbb
+Subproject commit 4b71369568e76fffec88ef579d97830967d0829d