- 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

4 files changed, 85 insertions, 131 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index e2f5e09..3494cfd 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -20,6 +20,12 @@ RELEASE 2.3.1.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
   From Philipp Kraus:
     - Added optional ZIPROOT to Zip tool.
 
+  From Dirk Baechle:
+    - Replaced old SGML-based documentation toolchain with a more modern
+      approach, that also requires less external dependencies (programs and
+      Python packages). Added a customized Docbook XSD for strict validation of
+      all input XML files.
+      
 RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400
 
   From Anatoly Techtonik:
diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in
index 920a603..a657734 100644
--- a/src/engine/MANIFEST-xml.in
+++ b/src/engine/MANIFEST-xml.in
@@ -1,108 +1,7 @@
-SCons/Action.xml
-SCons/Defaults.xml
-SCons/Environment.xml
-SCons/Platform/__init__.xml
-SCons/Platform/posix.xml
-SCons/Platform/sunos.xml
-SCons/Platform/win32.xml
+SCons/*.xml
+SCons/Platform/*.xml
 SCons/Scanner/__init__.xml
-SCons/Script/Main.xml
-SCons/Script/SConscript.xml
-SCons/Subst.xml
-SCons/Tool/386asm.xml
-SCons/Tool/BitKeeper.xml
-SCons/Tool/CVS.xml
-SCons/Tool/Perforce.xml
-SCons/Tool/RCS.xml
-SCons/Tool/SCCS.xml
-SCons/Tool/Subversion.xml
-SCons/Tool/__init__.xml
-SCons/Tool/aixc++.xml
-SCons/Tool/aixcc.xml
-SCons/Tool/aixf77.xml
-SCons/Tool/aixlink.xml
-SCons/Tool/applelink.xml
-SCons/Tool/ar.xml
-SCons/Tool/as.xml
-SCons/Tool/bcc32.xml
-SCons/Tool/c++.xml
-SCons/Tool/cc.xml
-SCons/Tool/cvf.xml
-SCons/Tool/default.xml
-SCons/Tool/dmd.xml
+SCons/Script/*.xml
+SCons/Tool/*.xml
 SCons/Tool/docbook/__init__.xml
-SCons/Tool/dvi.xml
-SCons/Tool/dvipdf.xml
-SCons/Tool/dvips.xml
-SCons/Tool/f77.xml
-SCons/Tool/f90.xml
-SCons/Tool/f95.xml
-SCons/Tool/fortran.xml
-SCons/Tool/g++.xml
-SCons/Tool/g77.xml
-SCons/Tool/gas.xml
-SCons/Tool/gcc.xml
-SCons/Tool/gfortran.xml
-SCons/Tool/gnulink.xml
-SCons/Tool/gs.xml
-SCons/Tool/hpc++.xml
-SCons/Tool/hpcc.xml
-SCons/Tool/hplink.xml
-SCons/Tool/icc.xml
-SCons/Tool/icl.xml
-SCons/Tool/ifl.xml
-SCons/Tool/ifort.xml
-SCons/Tool/ilink.xml
-SCons/Tool/ilink32.xml
-SCons/Tool/install.xml
-SCons/Tool/intelc.xml
-SCons/Tool/jar.xml
-SCons/Tool/javac.xml
-SCons/Tool/javah.xml
-SCons/Tool/latex.xml
-SCons/Tool/lex.xml
-SCons/Tool/link.xml
-SCons/Tool/linkloc.xml
-SCons/Tool/m4.xml
-SCons/Tool/masm.xml
-SCons/Tool/midl.xml
-SCons/Tool/mingw.xml
-SCons/Tool/mslib.xml
-SCons/Tool/mslink.xml
-SCons/Tool/mssdk.xml
-SCons/Tool/msvc.xml
-SCons/Tool/msvs.xml
-SCons/Tool/mwcc.xml
-SCons/Tool/mwld.xml
-SCons/Tool/nasm.xml
-SCons/Tool/packaging.xml
 SCons/Tool/packaging/__init__.xml
-SCons/Tool/pdf.xml
-SCons/Tool/pdflatex.xml
-SCons/Tool/pdftex.xml
-SCons/Tool/qt.xml
-SCons/Tool/rmic.xml
-SCons/Tool/rpcgen.xml
-SCons/Tool/sgiar.xml
-SCons/Tool/sgic++.xml
-SCons/Tool/sgicc.xml
-SCons/Tool/sgilink.xml
-SCons/Tool/sunar.xml
-SCons/Tool/sunc++.xml
-SCons/Tool/suncc.xml
-SCons/Tool/sunf77.xml
-SCons/Tool/sunf90.xml
-SCons/Tool/sunf95.xml
-SCons/Tool/sunlink.xml
-SCons/Tool/swig.xml
-SCons/Tool/tar.xml
-SCons/Tool/tex.xml
-SCons/Tool/textfile.xml
-SCons/Tool/tlib.xml
-SCons/Tool/yacc.xml
-SCons/Tool/zip.xml
-SCons/Tool/gettext.xml
-SCons/Tool/msgfmt.xml
-SCons/Tool/msginit.xml
-SCons/Tool/msgmerge.xml
-SCons/Tool/xgettext.xml
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index 7d3999a..5e7627f 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -1,14 +1,7 @@
 SCons/__init__.py
 SCons/Action.py
 SCons/Builder.py
-SCons/compat/__init__.py
-SCons/compat/_scons_builtins.py
-SCons/compat/_scons_collections.py
-SCons/compat/_scons_dbm.py
-SCons/compat/_scons_hashlib.py
-SCons/compat/_scons_io.py
-SCons/compat/_scons_sets.py
-SCons/compat/_scons_subprocess.py
+SCons/compat/*.py
 SCons/CacheDir.py
 SCons/Conftest.py
 SCons/cpp.py
@@ -25,12 +18,7 @@ SCons/Node/__init__.py
 SCons/Node/Alias.py
 SCons/Node/FS.py
 SCons/Node/Python.py
-SCons/Options/__init__.py
-SCons/Options/BoolOption.py
-SCons/Options/EnumOption.py
-SCons/Options/ListOption.py
-SCons/Options/PackageOption.py
-SCons/Options/PathOption.py
+SCons/Options/*.py
 SCons/PathList.py
 SCons/Platform/__init__.py
 SCons/Platform/aix.py
@@ -78,7 +66,7 @@ SCons/Tool/cvf.py
 SCons/Tool/CVS.py
 SCons/Tool/default.py
 SCons/Tool/dmd.py
-SCons/Tool/docbook/__init__.xml
+SCons/Tool/docbook/__init__.py
 SCons/Tool/dvi.py
 SCons/Tool/dvipdf.py
 SCons/Tool/dvips.py
@@ -135,16 +123,7 @@ SCons/Tool/msvs.py
 SCons/Tool/mwcc.py
 SCons/Tool/mwld.py
 SCons/Tool/nasm.py
-SCons/Tool/packaging/__init__.py
-SCons/Tool/packaging/ipk.py
-SCons/Tool/packaging/msi.py
-SCons/Tool/packaging/rpm.py
-SCons/Tool/packaging/src_tarbz2.py
-SCons/Tool/packaging/src_targz.py
-SCons/Tool/packaging/src_zip.py
-SCons/Tool/packaging/tarbz2.py
-SCons/Tool/packaging/targz.py
-SCons/Tool/packaging/zip.py
+SCons/Tool/packaging/*.py
 SCons/Tool/pdf.py
 SCons/Tool/pdflatex.py
 SCons/Tool/pdftex.py
diff --git a/src/setup.py b/src/setup.py
index 9037337..a8b59a3 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -408,11 +408,81 @@ arguments = {
                           "SCons.Scanner",
                           "SCons.Script",
                           "SCons.Tool",
+                          "SCons.Tool.docbook",
                           "SCons.Tool.MSCommon",
                           "SCons.Tool.packaging",
                           "SCons.Variables",
                          ],
-    'package_dir'      : {'' : 'engine'},
+    'package_dir'      : {'' : 'engine',
+                          'SCons.Tool.docbook' : 'engine/SCons/Tool/docbook'},
+    'package_data'     : {'SCons.Tool.docbook' : ['docbook-xsl-1.76.1/*',
+                                                  'docbook-xsl-1.76.1/common/*',
+                                                  'docbook-xsl-1.76.1/docsrc/*',
+                                                  'docbook-xsl-1.76.1/eclipse/*',
+                                                  'docbook-xsl-1.76.1/epub/*',
+                                                  'docbook-xsl-1.76.1/epub/bin/*',
+                                                  'docbook-xsl-1.76.1/epub/bin/lib/*',
+                                                  'docbook-xsl-1.76.1/epub/bin/xslt/*',
+                                                  'docbook-xsl-1.76.1/extensions/*',
+                                                  'docbook-xsl-1.76.1/fo/*',
+                                                  'docbook-xsl-1.76.1/highlighting/*',
+                                                  'docbook-xsl-1.76.1/html/*',
+                                                  'docbook-xsl-1.76.1/htmlhelp/*',
+                                                  'docbook-xsl-1.76.1/images/*',
+                                                  'docbook-xsl-1.76.1/images/callouts/*',
+                                                  'docbook-xsl-1.76.1/images/colorsvg/*',
+                                                  'docbook-xsl-1.76.1/javahelp/*',
+                                                  'docbook-xsl-1.76.1/lib/*',
+                                                  'docbook-xsl-1.76.1/manpages/*',
+                                                  'docbook-xsl-1.76.1/params/*',
+                                                  'docbook-xsl-1.76.1/profiling/*',
+                                                  'docbook-xsl-1.76.1/roundtrip/*',
+                                                  'docbook-xsl-1.76.1/slides/browser/*',
+                                                  'docbook-xsl-1.76.1/slides/fo/*',
+                                                  'docbook-xsl-1.76.1/slides/graphics/*',
+                                                  'docbook-xsl-1.76.1/slides/graphics/active/*',
+                                                  'docbook-xsl-1.76.1/slides/graphics/inactive/*',
+                                                  'docbook-xsl-1.76.1/slides/graphics/toc/*',
+                                                  'docbook-xsl-1.76.1/slides/html/*',
+                                                  'docbook-xsl-1.76.1/slides/htmlhelp/*',
+                                                  'docbook-xsl-1.76.1/slides/keynote/*',
+                                                  'docbook-xsl-1.76.1/slides/keynote/xsltsl/*',
+                                                  'docbook-xsl-1.76.1/slides/svg/*',
+                                                  'docbook-xsl-1.76.1/slides/xhtml/*',
+                                                  'docbook-xsl-1.76.1/template/*',
+                                                  'docbook-xsl-1.76.1/tests/*',
+                                                  'docbook-xsl-1.76.1/tools/bin/*',
+                                                  'docbook-xsl-1.76.1/tools/make/*',
+                                                  'docbook-xsl-1.76.1/webhelp/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/css/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/images/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/jquery/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/jquery/theme-redmond/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/jquery/theme-redmond/images/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/common/jquery/treeview/images/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/content/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/content/search/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docs/content/search/stemmers/*',
+                                                  'docbook-xsl-1.76.1/webhelp/docsrc/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/css/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/images/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/jquery/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/jquery/theme-redmond/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/jquery/theme-redmond/images/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/common/jquery/treeview/images/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/content/search/*',
+                                                  'docbook-xsl-1.76.1/webhelp/template/content/search/stemmers/*',
+                                                  'docbook-xsl-1.76.1/webhelp/xsl/*',
+                                                  'docbook-xsl-1.76.1/website/*',
+                                                  'docbook-xsl-1.76.1/xhtml/*',
+                                                  'docbook-xsl-1.76.1/xhtml-1_1/*',
+                                                  'utils/*']},
     'data_files'       : [('man/man1', man_pages)],
     'scripts'          : scripts,
     'cmdclass'         : {'install'         : install,