- patched setup.py and several MANIFEST files, such that the docbook-xsl

  folder and all additional documentation sources get packaged properly
- added basic support for wildcards and recursive globbing in MANIFEST files
- added missing JPG/SVG files

11 files changed, 358 insertions, 30 deletions

diff --git a/doc/SConscript b/doc/SConscript
index 7c888d2..8dcf697 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -30,6 +30,7 @@ import sys
 import glob
 import SConsDoc
 import SConsExamples
+import bootstrap
 
 Import('build_dir', 'env', 'whereis', 'revaction')
 
@@ -192,7 +193,7 @@ else:
     # get included by the document XML files in the subdirectories.
     #
     manifest = File('MANIFEST').rstr()
-    src_files = [x[:-1] for x in open(manifest).readlines()]
+    src_files = bootstrap.parseManifestLines('.', open(manifest).readlines())
     for s in src_files:
         if not s:
             continue
@@ -217,7 +218,7 @@ else:
         env.Execute(Mkdir(os.path.join(build, doc)))
         env.Execute(Mkdir(os.path.join(build, doc, 'titlepage')))
         manifest = File(os.path.join(doc, 'MANIFEST')).rstr()
-        src_files = [x[:-1] for x in open(manifest).readlines()]
+        src_files = bootstrap.parseManifestLines(doc, open(manifest).readlines())
         for s in src_files:
             if not s:
                 continue
@@ -363,7 +364,7 @@ else:
     # the SConstruct file.
     e = os.path.join('#src', 'engine')
     manifest_in = File(os.path.join(e, 'MANIFEST.in')).rstr()
-    sources = [x[:-1] for x in open(manifest_in).readlines()]
+    sources = bootstrap.parseManifestLines(e, open(manifest_in).readlines())
     sources = [x for x in sources if x.find('Platform') == -1]
     sources = [x for x in sources if x.find('Tool') == -1]
     # XXX
diff --git a/doc/design/MANIFEST b/doc/design/MANIFEST
index e93037f..0168e11 100644
--- a/doc/design/MANIFEST
+++ b/doc/design/MANIFEST
@@ -1,9 +1,9 @@
+# We don't use a wildcard for the XML files
+# here, because it would pull in the created
+# ones as well...
 acks.xml
 bground.xml
 copyright.xml
-engine.fig
-engine.jpg
-engine.svg
 engine.xml
 goals.xml
 install.xml
@@ -13,10 +13,10 @@ main.xml
 native.xml
 overview.xml
 summary.xml
-chtml.xsl
-html.xsl
-pdf.xsl
-scons_title.xsl
+engine.fig
+engine.jpg
+engine.svg
+*.xsl
 scons.css
 SConstruct
 titlepage/bricks.jpg
diff --git a/doc/design/titlepage/bricks.jpg b/doc/design/titlepage/bricks.jpg
new file mode 100755
index 0000000..b2dc16b
--- /dev/null
+++ b/doc/design/titlepage/bricks.jpg
diff --git a/doc/man/MANIFEST b/doc/man/MANIFEST
index 6c75f81..7f0ad45 100644
--- a/doc/man/MANIFEST
+++ b/doc/man/MANIFEST
@@ -1,9 +1,10 @@
+# We don't use a wildcard for the XML files
+# here, because it would pull in the created
+# ones as well...
 scons.xml
 sconsign.xml
 scons-time.xml
-html.xsl
-pdf.xsl
-scons_title.xsl
+*.xsl
 scons.css
 SConstruct
 titlepage/bricks.jpg
diff --git a/doc/man/titlepage/bricks.jpg b/doc/man/titlepage/bricks.jpg
new file mode 100755
index 0000000..b2dc16b
--- /dev/null
+++ b/doc/man/titlepage/bricks.jpg
diff --git a/doc/python10/MANIFEST b/doc/python10/MANIFEST
index 1be563b..5703e36 100644
--- a/doc/python10/MANIFEST
+++ b/doc/python10/MANIFEST
@@ -1,15 +1,14 @@
+# We don't use a wildcard for the XML files
+# here, because it would pull in the created
+# ones as well...
 abstract.xml
 acks.xml
-arch.fig
-builder.fig
+*.fig
 copyright.xml
 design.xml
 future.xml
 install.xml
 intro.xml
-job-task.fig
 main.xml
-node.fig
 process.xml
-scanner.fig
 summary.xml
diff --git a/doc/python10/builder.svg b/doc/python10/builder.svg
new file mode 100644
index 0000000..5648dd6
--- /dev/null
+++ b/doc/python10/builder.svg
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="744.09448"
+   height="1052.3622"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1">
+    <g
+       transform="matrix(0.07462687,0,0,0.07462687,-106.34331,286.09351)"
+       id="g3006"
+       style="fill:none;stroke-width:0.025in">
+      <rect
+         width="1800"
+         height="600"
+         rx="0"
+         x="2700"
+         y="1200"
+         id="rect3008"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1800"
+         height="600"
+         rx="0"
+         x="2700"
+         y="2400"
+         id="rect3010"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1800"
+         height="600"
+         rx="0"
+         x="2700"
+         y="3600"
+         id="rect3012"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1500"
+         height="600"
+         rx="0"
+         x="8400"
+         y="3600"
+         id="rect3014"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1500"
+         height="900"
+         rx="0"
+         x="3900"
+         y="4800"
+         id="rect3016"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1500"
+         height="900"
+         rx="0"
+         x="1800"
+         y="4800"
+         id="rect3018"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1500"
+         height="900"
+         rx="0"
+         x="6300"
+         y="4800"
+         id="rect3020"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1500"
+         height="900"
+         rx="0"
+         x="8400"
+         y="4800"
+         id="rect3022"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1500"
+         height="900"
+         rx="0"
+         x="10500"
+         y="4800"
+         id="rect3024"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <rect
+         width="1200"
+         height="600"
+         rx="0"
+         x="900"
+         y="2400"
+         id="rect3026"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="3600,4200 3600,4200 3525,4350 3675,4350 "
+         id="polygon3028"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polyline
+         id="polyline3030"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="3150,4800 3150,4500 4050,4500 4050,4800 " />
+      <polyline
+         id="polyline3032"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="3600,4350 3600,4500 " />
+      <polygon
+         points="9150,4200 9150,4200 9075,4350 9225,4350 "
+         id="polygon3034"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polyline
+         id="polyline3036"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="7050,4800 7050,4500 10950,4500 10950,4800 " />
+      <polyline
+         id="polyline3038"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="9150,4350 9150,4800 " />
+      <polyline
+         id="polyline3040"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="11550,4650 11550,3900 10019,3900 " />
+      <polygon
+         points="10021,3870 10021,3870 9901,3900 10021,3930 "
+         id="polygon3042"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3044"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="4650,3900 8280,3900 " />
+      <polygon
+         points="8279,3930 8279,3930 8399,3900 8279,3870 "
+         id="polygon3046"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3048"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="3900,2250 3900,1919 " />
+      <polygon
+         points="3930,1921 3930,1921 3900,1801 3870,1921 "
+         id="polygon3050"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3052"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="3300,1950 3300,2280 " />
+      <polygon
+         points="3270,2279 3270,2279 3300,2399 3330,2279 "
+         id="polygon3054"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3056"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="3600,3150 3600,3480 " />
+      <polygon
+         points="3570,3479 3570,3479 3600,3599 3630,3479 "
+         id="polygon3058"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3060"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="4350,4650 4350,4319 " />
+      <polygon
+         points="4380,4321 4380,4321 4350,4201 4320,4321 "
+         id="polygon3062"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3064"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="2850,4650 2850,4319 " />
+      <polygon
+         points="2880,4321 2880,4321 2850,4201 2820,4321 "
+         id="polygon3066"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polyline
+         id="polyline3068"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter"
+         points="1500,3150 1500,3900 2580,3900 " />
+      <polygon
+         points="2579,3930 2579,3930 2699,3900 2579,3870 "
+         id="polygon3070"
+         style="fill:#000000;stroke:#000000;stroke-width:7;stroke-miterlimit:8" />
+      <polygon
+         points="4575,3940 4650,3900 4650,3900 4575,3860 4500,3900 "
+         id="polygon3072"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="1540,3075 1500,3000 1500,3000 1460,3075 1500,3150 "
+         id="polygon3074"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="3640,3075 3600,3000 3600,3000 3560,3075 3600,3150 "
+         id="polygon3076"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="3340,1875 3300,1800 3300,1800 3260,1875 3300,1950 "
+         id="polygon3078"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="3940,2325 3900,2250 3900,2250 3860,2325 3900,2400 "
+         id="polygon3080"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="4390,4725 4350,4650 4350,4650 4310,4725 4350,4800 "
+         id="polygon3082"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="2890,4725 2850,4650 2850,4650 2810,4725 2850,4800 "
+         id="polygon3084"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polygon
+         points="11590,4725 11550,4650 11550,4650 11510,4725 11550,4800 "
+         id="polygon3086"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter" />
+      <polyline
+         id="polyline3088"
+         style="stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:40, 40"
+         points="3600,1200 3600,900 " />
+      <text
+         x="2925"
+         y="1575"
+         id="text3090"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:start;fill:#000000;font-family:Times">Environment</text>
+      <text
+         x="3600"
+         y="2775"
+         id="text3092"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">BuilderWrapper</text>
+      <text
+         x="3600"
+         y="3975"
+         id="text3094"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">BuilderBase</text>
+      <text
+         x="9150"
+         y="3975"
+         id="text3096"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">ActionBase</text>
+      <text
+         x="4650"
+         y="5175"
+         id="text3098"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">MultiStep-</text>
+      <text
+         x="4650"
+         y="5460"
+         id="text3100"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Builder</text>
+      <text
+         x="2550"
+         y="5175"
+         id="text3102"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Composite-</text>
+      <text
+         x="2550"
+         y="5460"
+         id="text3104"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Builder</text>
+      <text
+         x="7050"
+         y="5175"
+         id="text3106"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Command</text>
+      <text
+         x="7050"
+         y="5460"
+         id="text3108"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Action</text>
+      <text
+         x="9150"
+         y="5460"
+         id="text3110"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Action</text>
+      <text
+         x="9150"
+         y="5175"
+         id="text3112"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Function</text>
+      <text
+         x="11250"
+         y="5175"
+         id="text3114"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">List</text>
+      <text
+         x="11250"
+         y="5460"
+         id="text3116"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Action</text>
+      <text
+         x="1500"
+         y="2775"
+         id="text3118"
+         xml:space="preserve"
+         style="font-size:192px;font-style:normal;font-weight:normal;text-anchor:middle;fill:#000000;font-family:Times">Node</text>
+    </g>
+  </g>
+</svg>
diff --git a/doc/reference/MANIFEST b/doc/reference/MANIFEST
index a4a0c8f..921a4de 100644
--- a/doc/reference/MANIFEST
+++ b/doc/reference/MANIFEST
@@ -1,3 +1,6 @@
+# We don't use a wildcard for the XML files
+# here, because it would pull in the created
+# ones as well...
 Alias.xml
 CFile.xml
 CXXFile.xml
@@ -19,10 +22,7 @@ copyright.xml
 errors.xml
 main.xml
 preface.xml
-chtml.xsl
-html.xsl
-pdf.xsl
-scons_title.xsl
+*.xsl
 scons.css
 SConstruct
 titlepage/bricks.jpg
diff --git a/doc/reference/titlepage/bricks.jpg b/doc/reference/titlepage/bricks.jpg
new file mode 100755
index 0000000..b2dc16b
--- /dev/null
+++ b/doc/reference/titlepage/bricks.jpg
diff --git a/doc/user/MANIFEST b/doc/user/MANIFEST
index 8eb4ea1..e5f8988 100644
--- a/doc/user/MANIFEST
+++ b/doc/user/MANIFEST
@@ -1,3 +1,6 @@
+# We don't use a wildcard for the XML files
+# here, because it would pull in the created
+# ones as well...
 actions.xml
 add-method.xml
 alias.xml
@@ -46,14 +49,8 @@ tools.xml
 troubleshoot.xml
 variants.xml
 variables.xml
-SCons-win32-install-1.jpg
-SCons-win32-install-2.jpg
-SCons-win32-install-3.jpg
-SCons-win32-install-4.jpg
-chtml.xsl
-html.xsl
-pdf.xsl
-scons_title.xsl
+*.jpg
+*.xsl
 scons.css
 SConstruct
 titlepage/bricks.jpg
diff --git a/doc/user/titlepage/bricks.jpg b/doc/user/titlepage/bricks.jpg
new file mode 100755
index 0000000..b2dc16b
--- /dev/null
+++ b/doc/user/titlepage/bricks.jpg