Merge pull request #27 from ndw/master

Fix profiling and improve the build.
docbook · Nov 21, 2016 · 2dca9c4 · 2dca9c4
2 parents 2061bf2 + ca81ef3
commit 2dca9c4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 38 deletions.
diff --git a/en/bin/circle-ci-deploy.sh b/en/bin/circle-ci-deploy.sh
@@ -25,13 +25,9 @@ if [ "$GITHUB_CNAME" != "" ]; then
     echo $GITHUB_CNAME > CNAME
 fi;
 
-if [ -d ./tdg/{$DBVERSION} ]; then
-    git rm -rf ./tdg/${DBVERSION}
-fi
-
 mkdir -p ./tdg/${DBVERSION}
-cp -Rf $BUILD/html/* ./tdg/${DBVERSION}/
+rsync -ar --delete $BUILD/html/ ./tdg/${DBVERSION}/
 
-git add -f .
+git add --all .
 git commit -m "CircleCI build: $CIRCLE_BUILD_URL"
 git push -fq origin gh-pages
diff --git a/en/defguide5/build.gradle b/en/defguide5/build.gradle
@@ -155,10 +155,10 @@ task tdgxml(dependsOn: ['bookmeta', 'patterns', 'refpages'], type: XMLCalabashTa
   pipeline "../xpl/xinclude.xpl"
 }
 
-task book(dependsOn: 'tdgxml', type: XMLCalabashTask) {
+task book(dependsOn: ['tdgxml', 'setupDocBook'], type: XMLCalabashTask) {
   inputs.file file("build/tdg.xml")
   inputs.file file("../xpl/make-book.xpl")
-  inputs.file file("../stylesheets/profile.xsl")
+  inputs.file file("build/docbook/xslt/base/preprocess/30-profile.xsl")
   inputs.file file("../stylesheets/purpose.xsl")
   inputs.file file("../stylesheets/tdg2db.xsl")
   inputs.file file("../stylesheets/profile.xsl")
@@ -168,7 +168,10 @@ task book(dependsOn: 'tdgxml', type: XMLCalabashTask) {
   output("result", "build/book.xml")
   option("arch", "assembly defguide5")
   option("revision", "5.0 5.1")
-  option("condition", "refpages web")
+  // This crazy list of conditions is a side effect of the fact that
+  // I carelessly decided to override the condition attribute for
+  // something else inthe reference pages. :-(
+  option("condition", "expanded ref.desc.attribute-descriptions ref.desc.attributes ref.desc.children ref.desc.parents ref.description ref.desc.rules ref.desc.seealso ref.examples refpages web")
   pipeline "../xpl/make-book.xpl"
 }
 

diff --git a/en/defguide5/gradle.properties b/en/defguide5/gradle.properties
@@ -1,5 +1,5 @@
 docbookXsltBaseUri=http://cdn.docbook.org
 docbookXsltVersion=2.0.21
-bookVersion=1.4.18
+bookVersion=1.4.19
 docbookVersion=V5.2b1
 rnd=defguide.rnd
diff --git a/en/stylesheets/chunk.xsl b/en/stylesheets/chunk.xsl
@@ -12,7 +12,7 @@
                 exclude-result-prefixes="ch db f fn h m t xs"
                 version="2.0">
 
-<xsl:import href="http://docbook.github.com/release/latest/xslt/base/html/chunk.xsl"/>
+<xsl:import href="../defguide5/build/docbook/xslt/base/html/chunk.xsl"/>
 
 <xsl:include href="custom.xsl"/>
 

diff --git a/en/stylesheets/tdg.xsl b/en/stylesheets/tdg.xsl
diff --git a/en/xpl/make-book.xpl b/en/xpl/make-book.xpl
@@ -3,13 +3,13 @@
 <p:output port="result" />
 <p:input port="parameters" kind="parameter"/>
 
-<p:option name="not-condition" select="'compact print'"/>
 <p:option name="condition" select="''"/>
-<p:option name="not-arch" select="''"/>
 <p:option name="arch" select="'defguide5'"/>
 <p:option name="revision" required="true"/>
 
+<!--
 <p:import href="../defguide5/build/docbook/xslt/base/pipelines/docbook.xpl"/>
+-->
 
 <p:variable name="srcbase" select="base-uri(/)"/>
 
@@ -21,13 +21,12 @@
 
 <p:xslt name="profiled">
   <p:input port="stylesheet">
-    <p:document href="../stylesheets/profile.xsl"/>
+    <p:document href="../defguide5/build/docbook/xslt/base/preprocess/30-profile.xsl"/>
   </p:input>
-  <p:with-param name="condition" select="$condition"/>
-  <p:with-param name="not-condition" select="$not-condition"/>
-  <p:with-param name="arch" select="$arch"/>
-  <p:with-param name="not-arch" select="$not-arch"/>
-  <p:with-param name="revision" select="$revision"/>
+  <p:with-param name="profile.separator" select="' '"/>
+  <p:with-param name="profile.condition" select="$condition"/>
+  <p:with-param name="profile.arch"      select="$arch"/>
+  <p:with-param name="profile.revision"  select="$revision"/>
   <p:log port="result" href="/tmp/tdg-profile.xml"/>
 </p:xslt>