Merge pull request #105 from ndw/master

Use resources repository and misc fixes

build.gradle

@@ -31,13 +31,15 @@ plugins {
   id "maven"
   id "maven-publish"
   id "signing"
+  id "de.undercouch.download" version "2.0.0"
 }
 
 defaultTasks 'compileXslt'
 
 apply plugin: 'com.xmlcalabash.task'
 
 import com.xmlcalabash.XMLCalabashTask
+import de.undercouch.gradle.tasks.download.Download
 
 repositories {
   maven { url uri('/tmp/repo') }
@@ -191,7 +193,8 @@ task makeVersion(type: JavaExec) {
   args('-it:main',
        '-o:build/xslt/base/VERSION.xsl',
        '-xsl:tools/version.xsl',
-       'version=' + version)
+       'version=' + version,
+       'resourcesVersion=' + resourcesVersion)
 }
 
 // ======================================================================
@@ -365,10 +368,8 @@ task copyReadme(type: Copy) {
   into "build/stage/zip/"
 }
 
-task copyResources(type: Copy, dependsOn: [ "copyDocs", "copyVendors" ]) {
-  FileTree tree = fileTree(dir: 'resources', exclude: ['**/*_flymake.css'])
-  from tree
-  into "build/stage/zip/resources/"
+task copyResources(dependsOn: [ "copyDocs", "copyVendors", "setupResources" ]) {
+  // nop
 }
 
 task copyVendors(type: Copy) {
@@ -417,6 +418,7 @@ task makeVersionProperties() {
   }
   doLast {
     new File("build/stage/jar/etc/version.properties").text = """version=$version
+resourcesVersion=$resourcesVersion
 """
   }
 }
@@ -514,12 +516,54 @@ task dist(dependsOn: [ "zip", "copyJar" ]) {
   // nop
 }
 
+// ================================================================================
+// Setup resources
+
+// Explicitly not into build because it's tedious if 'clean' deletes
+// the resources, especially if you're not connected to the internet!
+task downloadResources(type: Download) {
+  String base = "https://github.com/docbook/xslt20-resources/releases/download/"
+  src base + resourcesVersion + "/docbook-xslt20-resources-" + resourcesVersion + ".zip"
+  dest new File("lib/resources-" + resourcesVersion + ".zip")
+  doFirst {
+    mkdir("lib")
+  }
+}
+downloadResources.onlyIf {
+  !file("lib/resources-" + resourcesVersion + ".zip").exists()
+}
+
+task setupResources(type: Copy, dependsOn: [ "downloadResources" ]) {
+  from zipTree(downloadResources.dest)
+  into { "build" }
+  doFirst {
+    mkdir("build/stage/zip")
+  }
+  doLast {
+    copy {
+      from "build/docbook-xslt20-resources-" + resourcesVersion
+      into "build/stage/zip/resources"
+      rename ("build/stage/zip/resources/docbook-xslt20-resources-" + resourcesVersion,
+              "build/stage/zip/resources")
+    }
+  }
+}
+setupResources.onlyIf {
+  !file("build/stage/zip/resources").exists()
+}
+
+// ================================================================================
+// Cleanup
+
 clean {
   doFirst {
     delete "build"
   }
 }
 
+// ================================================================================
+// Sign, publish, and upload
+
 signing {
   required { gradle.taskGraph.hasTask("uploadArchives") }
   sign configurations.archives

gradle.properties

@@ -1,6 +1,7 @@
-version=2.2.2
+version=2.3.0
 saxonVersion=9.8.0-8
 xmlCalabashVersion=1.1.19-98
+resourcesVersion=2.0.0
 
 snapshot=
 builtBy=Norman Walsh

gradletest/build.gradle

@@ -7,10 +7,10 @@ buildscript {
   }
 
   dependencies {
-    classpath group: 'org.docbook', name: 'docbook-xslt2', version: '2.2.0'
+    classpath group: 'org.docbook', name: 'docbook-xslt2', version: '2.3.0'
     classpath group: 'org.docbook', name: 'docbook-schemas', version: '5.1-1'
     classpath group: 'com.xmlcalabash', name: 'xmlcalabash', version: '1.1.18-98'
-    classpath group: 'com.xmlcalabash', name: 'xmlcalabash1-gradle', version: '1.3.2'
+    classpath group: 'com.xmlcalabash', name: 'xmlcalabash1-gradle', version: '1.3.4'
     classpath group: 'org.xmlresolver', name: 'xmlresolver', version: '0.13.1'
   }
 }
@@ -36,6 +36,7 @@ task testTask(type: XMLCalabashTask) {
 }
 
 task testDocBook(type: DocBookTask) {
+  // catalogFile = "/tmp/cat.xml"
   debug = true
   uriResolver = "org.xmlresolver.Resolver"
   input("source", "input.xml")