doc build improvements

diff --git a/doc/build/composer.json b/doc/build/composer.json
index f75f150..2f062f4 100644 (file)
--- a/doc/build/composer.json
+++ b/doc/build/composer.json
@@ -19,5 +19,10 @@
                 }
             }
         }
-    ]
+    ],
+    "config": {
+        "allow-plugins": {
+            "symfony/flex": true
+        }
+    }
 }

diff --git a/doc/build/custom.fo.xsl b/doc/build/custom.fo.xsl
index b1964c0..04202ad 100644 (file)
--- a/doc/build/custom.fo.xsl
+++ b/doc/build/custom.fo.xsl
@@ -11,8 +11,8 @@
 -->
 
 
-<!-- import base stylesheet -->
-<xsl:import href="../../../../vendor/docbook/docbook-xsl/fo/docbook.xsl"/>
+<!-- import base stylesheet. This assumes the 'workspace' dir is next to the 'tools' one -->
+<xsl:import href="../../../../tools/vendor/docbook/docbook-xsl/fo/docbook.xsl"/>
 
 
 <!-- customization vars -->
@@ -100,4 +100,4 @@
 </xsl:template>
 
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/pakefile.php b/pakefile.php
index a0aaa6b..2a726d6 100644 (file)
--- a/pakefile.php
+++ b/pakefile.php
@@ -22,7 +22,8 @@ class Builder
     );
     protected static $options = array(
         'repo' => 'https://github.com/gggeek/phpxmlrpc',
-        'branch' => 'master'
+        'branch' => 'master',
+        'workspace' => null
     );
 
     public static function libVersion()
@@ -39,7 +40,7 @@ class Builder
 
     public static function workspaceDir()
     {
-        return self::buildDir().'/workspace';
+        return self::option('workspace') != '' ? self::option('workspace') : self::buildDir().'/workspace';
     }
 
     public static function toolsDir()
@@ -352,9 +353,10 @@ function run_dist($task=null, $args=array(), $cliOpts=array())
     // copy workspace dir into dist dir, without git
     pake_mkdirs(Builder::distDir());
     $finder = pakeFinder::type('any')->ignore_version_control();
+    /// @todo make sure we don't recurse - avoid 'build' dir
     pake_mirror($finder, realpath(Builder::workspaceDir()), realpath(Builder::distDir()));
 
-    // remove unwanted files from dist dir
+    // @todo remove unwanted files from dist dir - files and dirs from .gitattributes
 
     // also: do we still need to run dos2unix?