From 101184f00f6c8cf8487cab10f05af7ec6914222e Mon Sep 17 00:00:00 2001
From: gggeek <giunta.gaetano@gmail.com>
Date: Mon, 27 Apr 2015 21:49:08 +0100
Subject: [PATCH] Restructure the documentation folder; add more options to
 makefile

---
 README.md                                     |   5 +-
 doc/{ => build}/custom.fo.xsl                 | 204 +++++++++---------
 doc/{ => build}/custom.xsl                    |   2 +-
 doc/custom.dsl                                |  25 ---
 .../css-docbook}/COPYING                      |  34 +--
 .../css-docbook}/CREDITS                      |  20 +-
 .../css-docbook}/core.css                     |   0
 .../css-docbook}/db-bindings.xml              |  62 +++---
 .../css-docbook}/driver.css                   |   0
 .../css-docbook}/l10n.css                     |   0
 .../css-docbook}/l10n/de.css                  |   0
 .../css-docbook}/l10n/en.css                  |   0
 .../css-docbook}/l10n/es.css                  |   0
 .../css-docbook}/l10n/pl.css                  |   0
 .../css-docbook}/mozilla.css                  |   0
 .../css-docbook}/opera.css                    |   0
 .../css-docbook}/styles.css                   |   0
 .../css-docbook}/tables.css                   |   0
 .../css-docbook}/xmlrpc.css                   |   0
 doc/{ => manual/images}/debugger.gif          | Bin
 doc/{ => manual/images}/progxmlrpc.s.gif      | Bin
 .../phpxmlrpc_manual.xml}                     |   6 +-
 pakefile.php                                  |  75 ++++---
 23 files changed, 216 insertions(+), 217 deletions(-)
 rename doc/{ => build}/custom.fo.xsl (93%)
 rename doc/{ => build}/custom.xsl (97%)
 delete mode 100644 doc/custom.dsl
 rename doc/{docbook-css => manual/css-docbook}/COPYING (98%)
 rename doc/{docbook-css => manual/css-docbook}/CREDITS (95%)
 rename doc/{docbook-css => manual/css-docbook}/core.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/db-bindings.xml (96%)
 rename doc/{docbook-css => manual/css-docbook}/driver.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/l10n.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/l10n/de.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/l10n/en.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/l10n/es.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/l10n/pl.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/mozilla.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/opera.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/styles.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/tables.css (100%)
 rename doc/{docbook-css => manual/css-docbook}/xmlrpc.css (100%)
 rename doc/{ => manual/images}/debugger.gif (100%)
 rename doc/{ => manual/images}/progxmlrpc.s.gif (100%)
 rename doc/{xmlrpc_php.xml => manual/phpxmlrpc_manual.xml} (99%)

diff --git a/README.md b/README.md
index b0d323b..dfc9631 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,9 @@ Installation instructions are in the [INSTALL.md](INSTALL.md) file.
 
 Docs
 ----
-The manual, in HTML and pdf versions, can be found in the doc/ directory.
-Use of this software is subject to the terms in doc/index.html
+The manual can be found in the doc/manual directory, in HTML and PDF versions for release tarballs and Docbook always.
+
+Use of this software is subject to the terms in the [license.txt](license.txt) file
 
 SSL-certificate
 ---------------
diff --git a/doc/custom.fo.xsl b/doc/build/custom.fo.xsl
similarity index 93%
rename from doc/custom.fo.xsl
rename to doc/build/custom.fo.xsl
index 1ba937c..b1964c0 100644
--- a/doc/custom.fo.xsl
+++ b/doc/build/custom.fo.xsl
@@ -1,103 +1,103 @@
-<?xml version='1.0'?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format">
-<!--
- Customization xsl stylesheet for docbook to pdf transform
- @author Gaetano Giunta
- @copyright (c) 2007-2015 G. Giunta
- @license code licensed under the BSD License
- @todo make the xsl more dynamic: the path to import docbook.xsl could be f.e. rewritten/injected by the php user
--->
-
-
-<!-- import base stylesheet -->
-<xsl:import href="../../../vendor/docbook/docbook-xsl/fo/docbook.xsl"/>
-
-
-<!-- customization vars -->
-<xsl:param name="fop1.extensions">1</xsl:param>
-<xsl:param name="draft.mode">no</xsl:param>
-<xsl:param name="funcsynopsis.style">ansi</xsl:param>
-<xsl:param name="id.warnings">0</xsl:param>
-<xsl:param name="highlight.source">1</xsl:param>
-<xsl:param name="highlight.default.language">php</xsl:param>
-<xsl:param name="paper.type">A4</xsl:param>
-<xsl:param name="shade.verbatim">1</xsl:param>
-
-<xsl:attribute-set name="verbatim.properties">
-  <xsl:attribute name="font-size">80%</xsl:attribute>
-</xsl:attribute-set>
-
-
-<!-- elements added / modified -->
-<xsl:template match="funcdef/function">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <fo:inline font-weight="bold">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="funcdef/type">
-  <xsl:apply-templates/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="void">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.style='ansi'">
-      <xsl:text>( void )</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>( )</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varargs">
-  <xsl:text>( ... )</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef">
-  <xsl:variable name="paramnum">
-    <xsl:number count="paramdef" format="1"/>
-  </xsl:variable>
-  <xsl:if test="$paramnum=1">( </xsl:if>
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.style='ansi'">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="./parameter"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="following-sibling::paramdef">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> )</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/type">
-  <xsl:apply-templates/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<!-- default values for function parameters -->
-<xsl:template match="paramdef/initializer">
-  <xsl:text> = </xsl:text>
-  <xsl:apply-templates/>
-</xsl:template>
-
-
+<?xml version='1.0'?>
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<!--
+ Customization xsl stylesheet for docbook to pdf transform
+ @author Gaetano Giunta
+ @copyright (c) 2007-2015 G. Giunta
+ @license code licensed under the BSD License
+ @todo make the xsl more dynamic: the path to import docbook.xsl could be f.e. rewritten/injected by the php user
+-->
+
+
+<!-- import base stylesheet -->
+<xsl:import href="../../../../vendor/docbook/docbook-xsl/fo/docbook.xsl"/>
+
+
+<!-- customization vars -->
+<xsl:param name="fop1.extensions">1</xsl:param>
+<xsl:param name="draft.mode">no</xsl:param>
+<xsl:param name="funcsynopsis.style">ansi</xsl:param>
+<xsl:param name="id.warnings">0</xsl:param>
+<xsl:param name="highlight.source">1</xsl:param>
+<xsl:param name="highlight.default.language">php</xsl:param>
+<xsl:param name="paper.type">A4</xsl:param>
+<xsl:param name="shade.verbatim">1</xsl:param>
+
+<xsl:attribute-set name="verbatim.properties">
+  <xsl:attribute name="font-size">80%</xsl:attribute>
+</xsl:attribute-set>
+
+
+<!-- elements added / modified -->
+<xsl:template match="funcdef/function">
+  <xsl:choose>
+    <xsl:when test="$funcsynopsis.decoration != 0">
+      <fo:inline font-weight="bold">
+        <xsl:apply-templates/>
+      </fo:inline>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates/>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:text> </xsl:text>
+</xsl:template>
+
+<xsl:template match="funcdef/type">
+  <xsl:apply-templates/>
+  <xsl:text> </xsl:text>
+</xsl:template>
+
+<xsl:template match="void">
+  <xsl:choose>
+    <xsl:when test="$funcsynopsis.style='ansi'">
+      <xsl:text>( void )</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>( )</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="varargs">
+  <xsl:text>( ... )</xsl:text>
+</xsl:template>
+
+<xsl:template match="paramdef">
+  <xsl:variable name="paramnum">
+    <xsl:number count="paramdef" format="1"/>
+  </xsl:variable>
+  <xsl:if test="$paramnum=1">( </xsl:if>
+  <xsl:choose>
+    <xsl:when test="$funcsynopsis.style='ansi'">
+      <xsl:apply-templates/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="./parameter"/>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:choose>
+    <xsl:when test="following-sibling::paramdef">
+      <xsl:text>, </xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text> )</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="paramdef/type">
+  <xsl:apply-templates/>
+  <xsl:text> </xsl:text>
+</xsl:template>
+
+<!-- default values for function parameters -->
+<xsl:template match="paramdef/initializer">
+  <xsl:text> = </xsl:text>
+  <xsl:apply-templates/>
+</xsl:template>
+
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/doc/custom.xsl b/doc/build/custom.xsl
similarity index 97%
rename from doc/custom.xsl
rename to doc/build/custom.xsl
index f648887..aed8d5e 100644
--- a/doc/custom.xsl
+++ b/doc/build/custom.xsl
@@ -15,7 +15,7 @@
 
 
 <!-- import base stylesheet -->
-<xsl:import href="../vendor/docbook/docbook-xsl/xhtml/chunk.xsl"/>
+<xsl:import href="../../vendor/docbook/docbook-xsl/xhtml/chunk.xsl"/>
 
 
 <!-- customization vars -->
diff --git a/doc/custom.dsl b/doc/custom.dsl
deleted file mode 100644
index b3b35ce..0000000
--- a/doc/custom.dsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY dbstyle SYSTEM "/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/html/docbook.dsl" CDATA DSSSL>
-]>
-
-<style-sheet>
-<style-specification use="docbook">
-<style-specification-body>
-
-(define %link-mailto-url%
-	"edd@usefulinc.com")
-
-(define %html-ext%
-	".html")
-
-(define %use-id-as-filename%
-  #t)
-
-(define %root-filename%
-  "index")
-
-
-</style-specification-body>
-</style-specification>
-<external-specification id="docbook" document="dbstyle">
-</style-sheet>
diff --git a/doc/docbook-css/COPYING b/doc/manual/css-docbook/COPYING
similarity index 98%
rename from doc/docbook-css/COPYING
rename to doc/manual/css-docbook/COPYING
index d199ddc..735dca1 100644
--- a/doc/docbook-css/COPYING
+++ b/doc/manual/css-docbook/COPYING
@@ -1,17 +1,17 @@
-Copyright (c) 2004 David Holroyd, and contributors.
-
-Permission to use, copy, modify and distribute this software and its
-documentation for any purpose and without fee is hereby granted in
-perpetuity, provided that the above copyright notice appear in all
-copies, and that both the copyright notice and this permission notice
-appear in supporting documentation. The contributors make no
-representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Copyright (c) 2004 David Holroyd, and contributors.
+
+Permission to use, copy, modify and distribute this software and its
+documentation for any purpose and without fee is hereby granted in
+perpetuity, provided that the above copyright notice appear in all
+copies, and that both the copyright notice and this permission notice
+appear in supporting documentation. The contributors make no
+representations about the suitability of this software for any
+purpose. It is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/doc/docbook-css/CREDITS b/doc/manual/css-docbook/CREDITS
similarity index 95%
rename from doc/docbook-css/CREDITS
rename to doc/manual/css-docbook/CREDITS
index 08d96c5..cbc51ee 100644
--- a/doc/docbook-css/CREDITS
+++ b/doc/manual/css-docbook/CREDITS
@@ -1,10 +1,10 @@
-This stylesheet was writen by David Holroyd, with patches, suggestions,
-translations, and other help from these people:
-
-  David Leppik
-  Martin Gautier
-  Asia Magiera
-  Federico Koessler
-  Katie McSweenie
-
-Many thanks to all of them!
+This stylesheet was writen by David Holroyd, with patches, suggestions,
+translations, and other help from these people:
+
+  David Leppik
+  Martin Gautier
+  Asia Magiera
+  Federico Koessler
+  Katie McSweenie
+
+Many thanks to all of them!
diff --git a/doc/docbook-css/core.css b/doc/manual/css-docbook/core.css
similarity index 100%
rename from doc/docbook-css/core.css
rename to doc/manual/css-docbook/core.css
diff --git a/doc/docbook-css/db-bindings.xml b/doc/manual/css-docbook/db-bindings.xml
similarity index 96%
rename from doc/docbook-css/db-bindings.xml
rename to doc/manual/css-docbook/db-bindings.xml
index cb575fd..f3c0059 100644
--- a/doc/docbook-css/db-bindings.xml
+++ b/doc/manual/css-docbook/db-bindings.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
-<bindings xmlns="http://www.mozilla.org/xbl"
-     xmlns:html="http://www.w3.org/1999/xhtml">
-  <binding id="ulink">
-    <handlers>
-      <handler event="click" button="0"
-               action="window.location=this.attributes.url.value;"/>
-      <handler event="mouseover"
-               action="window.status=this.attributes.url.value;"/>
-      <handler event="mouseout"
-               action="window.status=null;"/>
-    </handlers>
-  </binding>
-
-  <binding id="image">
-    <content>
-      <html:img xbl:inherits="src=fileref"/>
-    </content>
-
-    <implementation>
-      <constructor>
-	var img = document.getAnonymousNodes(this)[0];
-	var file = this.getAttribute("fileref");
-	// HACK: using img.src=file 'inline' doesn't seem to work
-	//       but it does when called from a setTimeout()
-	var f = function() { img.src = file; }
-	setTimeout(f, 0);
-      </constructor>
-    </implementation>
-  </binding>
-</bindings>
+<?xml version="1.0"?>
+<bindings xmlns="http://www.mozilla.org/xbl"
+     xmlns:html="http://www.w3.org/1999/xhtml">
+  <binding id="ulink">
+    <handlers>
+      <handler event="click" button="0"
+               action="window.location=this.attributes.url.value;"/>
+      <handler event="mouseover"
+               action="window.status=this.attributes.url.value;"/>
+      <handler event="mouseout"
+               action="window.status=null;"/>
+    </handlers>
+  </binding>
+
+  <binding id="image">
+    <content>
+      <html:img xbl:inherits="src=fileref"/>
+    </content>
+
+    <implementation>
+      <constructor>
+	var img = document.getAnonymousNodes(this)[0];
+	var file = this.getAttribute("fileref");
+	// HACK: using img.src=file 'inline' doesn't seem to work
+	//       but it does when called from a setTimeout()
+	var f = function() { img.src = file; }
+	setTimeout(f, 0);
+      </constructor>
+    </implementation>
+  </binding>
+</bindings>
diff --git a/doc/docbook-css/driver.css b/doc/manual/css-docbook/driver.css
similarity index 100%
rename from doc/docbook-css/driver.css
rename to doc/manual/css-docbook/driver.css
diff --git a/doc/docbook-css/l10n.css b/doc/manual/css-docbook/l10n.css
similarity index 100%
rename from doc/docbook-css/l10n.css
rename to doc/manual/css-docbook/l10n.css
diff --git a/doc/docbook-css/l10n/de.css b/doc/manual/css-docbook/l10n/de.css
similarity index 100%
rename from doc/docbook-css/l10n/de.css
rename to doc/manual/css-docbook/l10n/de.css
diff --git a/doc/docbook-css/l10n/en.css b/doc/manual/css-docbook/l10n/en.css
similarity index 100%
rename from doc/docbook-css/l10n/en.css
rename to doc/manual/css-docbook/l10n/en.css
diff --git a/doc/docbook-css/l10n/es.css b/doc/manual/css-docbook/l10n/es.css
similarity index 100%
rename from doc/docbook-css/l10n/es.css
rename to doc/manual/css-docbook/l10n/es.css
diff --git a/doc/docbook-css/l10n/pl.css b/doc/manual/css-docbook/l10n/pl.css
similarity index 100%
rename from doc/docbook-css/l10n/pl.css
rename to doc/manual/css-docbook/l10n/pl.css
diff --git a/doc/docbook-css/mozilla.css b/doc/manual/css-docbook/mozilla.css
similarity index 100%
rename from doc/docbook-css/mozilla.css
rename to doc/manual/css-docbook/mozilla.css
diff --git a/doc/docbook-css/opera.css b/doc/manual/css-docbook/opera.css
similarity index 100%
rename from doc/docbook-css/opera.css
rename to doc/manual/css-docbook/opera.css
diff --git a/doc/docbook-css/styles.css b/doc/manual/css-docbook/styles.css
similarity index 100%
rename from doc/docbook-css/styles.css
rename to doc/manual/css-docbook/styles.css
diff --git a/doc/docbook-css/tables.css b/doc/manual/css-docbook/tables.css
similarity index 100%
rename from doc/docbook-css/tables.css
rename to doc/manual/css-docbook/tables.css
diff --git a/doc/docbook-css/xmlrpc.css b/doc/manual/css-docbook/xmlrpc.css
similarity index 100%
rename from doc/docbook-css/xmlrpc.css
rename to doc/manual/css-docbook/xmlrpc.css
diff --git a/doc/debugger.gif b/doc/manual/images/debugger.gif
similarity index 100%
rename from doc/debugger.gif
rename to doc/manual/images/debugger.gif
diff --git a/doc/progxmlrpc.s.gif b/doc/manual/images/progxmlrpc.s.gif
similarity index 100%
rename from doc/progxmlrpc.s.gif
rename to doc/manual/images/progxmlrpc.s.gif
diff --git a/doc/xmlrpc_php.xml b/doc/manual/phpxmlrpc_manual.xml
similarity index 99%
rename from doc/xmlrpc_php.xml
rename to doc/manual/phpxmlrpc_manual.xml
index 363f8a7..5c69ba7 100644
--- a/doc/xmlrpc_php.xml
+++ b/doc/manual/phpxmlrpc_manual.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="docbook-css/driver.css" type="text/css"?>
+<?xml-stylesheet href="css-docbook/driver.css" type="text/css"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!--
@@ -1166,7 +1166,7 @@ PHP-XMLRPC User manual
     <sect1 id="jellyfish" xreflabel="The Jellyfish Book">
       <title>The Jellyfish Book</title>
 
-      <para><graphic align="right" depth="190" fileref="progxmlrpc.s.gif"
+      <para><graphic align="right" depth="190" fileref="images/progxmlrpc.s.gif"
       format="GIF" width="145" />Together with Simon St.Laurent and Joe
       Johnston, Edd Dumbill wrote a book on XML-RPC for O'Reilly and
       Associates on XML-RPC. It features a rather fetching jellyfish on the
@@ -4218,7 +4218,7 @@ else
     <para>The interface should be self-explicative enough to need little
     documentation.</para>
 
-    <para><graphic align="center" fileref="debugger.gif"
+    <para><graphic align="center" fileref="images/debugger.gif"
     format="GIF" /></para>
 
     <para>The most useful feature of the debugger is without doubt the "Show
diff --git a/pakefile.php b/pakefile.php
index 6866f58..09f060f 100644
--- a/pakefile.php
+++ b/pakefile.php
@@ -21,9 +21,15 @@ class Builder
         'fop' => 'fop',
         'php' => 'php'
     );
+    protected static $options = array(
+        'repo' => 'https://github.com/gggeek/phpxmlrpc',
+        'branch' => 'php53'
+    );
 
     public static function libVersion()
     {
+        if (self::$libVersion == null)
+            throw new \Exception('Missing library version argument');
         return self::$libVersion;
     }
 
@@ -52,17 +58,12 @@ class Builder
         );
     }
 
-    public static function sourceRepo()
-    {
-        return 'https://github.com/gggeek/phpxmlrpc';
-    }
-
     /// @todo move git branch to be a named option?
     public static function getOpts($args=array(), $cliOpts=array())
     {
-        if (count($args) < 1)
-            throw new \Exception('Missing library version argument');
-        self::$libVersion = $args[0];
+        if (count($args) > 0)
+        //    throw new \Exception('Missing library version argument');
+            self::$libVersion = $args[0];
         if (count($args) > 1)
             self::$sourceBranch = $args[1];
 
@@ -72,6 +73,12 @@ class Builder
             }
         }
 
+        foreach (self::$options as $name => $value) {
+            if (isset($cliOpts[$name])) {
+                self::$options[$name] = $cliOpts[$name];
+            }
+        }
+
         //pake_echo('---'.self::$libVersion.'---');
     }
 
@@ -80,6 +87,11 @@ class Builder
         return self::$tools[$name];
     }
 
+    public static function option($name)
+    {
+        return self::$options[$name];
+    }
+
     /**
      * @param string $inFile
      * @param string $xssFile
@@ -170,11 +182,15 @@ function run_default($task=null, $args=array(), $cliOpts=array())
     echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n";
     echo "\n";
     echo "  Run 'pake help' to list all pake options\n";
-    echo "  Run 'pake -T' to list all available tasks\n";
+    echo "  Run 'pake -T' to list available tasks\n";
+    echo "  Run 'pake -P' to list all available tasks (including hidden ones) and their dependencies\n";
+    echo "\n";
     echo "  Task options:\n";
-    echo "      --php=\$php";
-    echo "      --fop=\$fop";
-    echo "      --zip=\$zip";
+    echo "      --repo=REPO      URL of the source repository to clone. defaults to the github repo.\n";
+    echo "      --branch=BRANCH  The git branch to build from.\n";
+    echo "      --php=PHP        Location of the php command-line interpreter\n";
+    echo "      --fop=FOP        Location of the fop command-line tool\n";
+    echo "      --zip=ZIP        Location of the zip tool\n";
 }
 
 function run_getopts($task=null, $args=array(), $cliOpts=array())
@@ -189,13 +205,12 @@ function run_init($task=null, $args=array(), $cliOpts=array())
 {
     // download the current version into the workspace
     $targetDir = Builder::workspaceDir();
-    $targetBranch = 'php53';
 
     // check if workspace exists and is not already set to the correct repo
     if (is_dir($targetDir) && pakeGit::isRepository($targetDir)) {
         $repo = new pakeGit($targetDir);
         $remotes = $repo->remotes();
-        if (trim($remotes['origin']['fetch']) != Builder::sourceRepo()) {
+        if (trim($remotes['origin']['fetch']) != Builder::option('repo')) {
             throw new Exception("Directory '$targetDir' exists and is not linked to correct git repo");
         }
 
@@ -203,10 +218,10 @@ function run_init($task=null, $args=array(), $cliOpts=array())
         $repo->pull();
     } else {
         pake_mkdirs(dirname($targetDir));
-        $repo = pakeGit::clone_repository(Builder::sourceRepo(), Builder::workspaceDir());
+        $repo = pakeGit::clone_repository(Builder::option('repo'), Builder::workspaceDir());
     }
 
-    $repo->checkout($targetBranch);
+    $repo->checkout(Builder::option('branch'));
 }
 
 /**
@@ -220,8 +235,10 @@ function run_build($task=null, $args=array(), $cliOpts=array())
 
 function run_clean_doc()
 {
-    pake_remove_dir(Builder::workspaceDir().'/doc/out');
-    pake_remove_dir(Builder::workspaceDir().'/doc/javadoc-out');
+    //pake_remove_dir(Builder::workspaceDir().'/doc/out');
+    pake_remove_dir(Builder::workspaceDir().'/doc/api');
+    $finder = pakeFinder::type('file')->name('*.html');
+    pake_remove($finder, Builder::workspaceDir().'/doc/manual');
 }
 
 /**
@@ -233,7 +250,7 @@ function run_doc($task=null, $args=array(), $cliOpts=array())
 
     // API docs from phpdoc comments using phpdocumentor
     $cmd = Builder::tool('php');
-    pake_sh("$cmd vendor/phpdocumentor/phpdocumentor/bin/phpdoc run -d ".Builder::workspaceDir().'/src'." -t ".Builder::workspaceDir().'/doc/javadoc-out --title PHP-XMLRPC');
+    pake_sh("$cmd vendor/phpdocumentor/phpdocumentor/bin/phpdoc run -d ".Builder::workspaceDir().'/src'." -t ".Builder::workspaceDir().'/doc/api --title PHP-XMLRPC');
 
     # Jade cmd yet to be rebuilt, starting from xml file and putting output in ./out dir, e.g.
     #	jade -t xml -d custom.dsl xmlrpc_php.xml
@@ -250,13 +267,13 @@ function run_doc($task=null, $args=array(), $cliOpts=array())
     #	-Dxslthl.config=file:///c:/htdocs/xmlrpc_cvs/docbook-xsl/highlighting/xslthl-config.xml \
     #	com.icl.saxon.StyleSheet -o xmlrpc_php.fo.xml xmlrpc_php.xml custom.fo.xsl use.extensions=1
 
-    pake_mkdirs($docDir.'/out');
+    //pake_mkdirs($docDir.'/out');
 
     // HTML files from docbook
 
-    Builder::applyXslt($docDir.'/xmlrpc_php.xml', $docDir.'/custom.xsl', $docDir.'/out/');
+    Builder::applyXslt($docDir.'/manual/phpxmlrpc_manual.xml', $docDir.'/build/custom.xsl', $docDir.'/manual');
     // post process html files to highlight php code samples
-    foreach(pakeFinder::type('file')->name('*.html')->in($docDir) as $file)
+    foreach(pakeFinder::type('file')->name('*.html')->in($docDir.'/manual') as $file)
     {
         file_put_contents($file, Builder::highlightPhpInHtml(file_get_contents($file)));
     }
@@ -264,10 +281,10 @@ function run_doc($task=null, $args=array(), $cliOpts=array())
     // PDF file from docbook
 
     // convert to fo and then to pdf using apache fop
-    Builder::applyXslt($docDir.'/xmlrpc_php.xml', $docDir.'/custom.fo.xsl', $docDir.'/xmlrpc_php.fo.xml');
+    Builder::applyXslt($docDir.'/manual/phpxmlrpc_manual.xml', $docDir.'/build/custom.fo.xsl', $docDir.'/manual/phpxmlrpc_manual.fo.xml');
     $cmd = Builder::tool('fop');
-    pake_sh("$cmd $docDir/xmlrpc_php.fo.xml $docDir/xmlrpc_php.pdf");
-    unlink($docDir.'/xmlrpc_php.fo.xml');
+    pake_sh("$cmd $docDir/phpxmlrpc_manual.fo.xml $docDir/phpxmlrpc_manual.pdf");
+    unlink($docDir.'/manual/phpxmlrpc_manual.fo.xml');
 }
 
 function run_clean_dist()
@@ -312,8 +329,13 @@ function run_dist($task=null, $args=array(), $cliOpts=array())
     chdir($cwd);
 }
 
+function run_clean_workspace($task=null, $args=array(), $cliOpts=array())
+{
+    pake_remove_dir(Builder::workspaceDir());
+}
+
 /**
- * Cleans up the build directory
+ * Cleans up the whole build directory
  * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources
  */
 function run_clean($task=null, $args=array(), $cliOpts=array())
@@ -331,6 +353,7 @@ pake_task('build', 'getopts', 'init', 'doc');
 pake_task('dist', 'getopts', 'init', 'build', 'clean-dist');
 pake_task('clean-doc', 'getopts');
 pake_task('clean-dist', 'getopts');
+pake_task('clean-workspace', 'getopts');
 pake_task('clean', 'getopts');
 
 }
-- 
2.43.0