From f3804d3ea527ef8c17d207fc216cc269853c0613 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Mon, 18 Sep 2017 12:47:52 -0700
Subject: Add src/engine/SCons/Tool/docbook/utils/xmldepend.xsl to
 MANIFEST-xml.in

---
 SConstruct                 |  5 +++++
 bootstrap.py               | 12 +++++++++---
 src/engine/MANIFEST-xml.in |  1 +
 src/engine/MANIFEST.in     |  3 ++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index b14fe455..4ec35453 100644
--- a/SConstruct
+++ b/SConstruct
@@ -776,11 +776,16 @@ for p in [ scons ]:
         for sp in p['subpkgs']:
             ssubdir = sp['src_subdir']
             isubdir = p['subinst_dirs'][sp['pkg']]
+
+            
             MANIFEST_in = File(os.path.join(src, ssubdir, 'MANIFEST.in')).rstr()
             MANIFEST_in_list.append(MANIFEST_in)
             files = bootstrap.parseManifestLines(os.path.join(src, ssubdir), open(MANIFEST_in).readlines())
+
             raw_files.extend(files)
             src_files.extend([os.path.join(ssubdir, x) for x in files])
+
+               
             for f in files:
                 r = os.path.join(sp['rpm_dir'], f)
                 rpm_files.append(r)
diff --git a/bootstrap.py b/bootstrap.py
index 08df11db..086270cb 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -184,9 +184,15 @@ def main():
     scons_py = os.path.join('src', 'script', 'scons.py')
     src_engine = os.path.join('src', 'engine')
     MANIFEST_in = find(os.path.join(src_engine, 'MANIFEST.in'))
-    
-    files = [ scons_py ] + [os.path.join(src_engine, x)
-                            for x in parseManifestLines(os.path.join(script_dir, src_engine), open(MANIFEST_in).readlines())]
+    MANIFEST_xml_in = find(os.path.join(src_engine, 'MANIFEST-xml.in'))
+    manifest_files = [os.path.join(src_engine, x)
+                            for x in parseManifestLines(os.path.join(script_dir, src_engine),
+                                                        open(MANIFEST_in).readlines())]
+
+    manifest_xml_files = [os.path.join(src_engine, x)
+                            for x in parseManifestLines(os.path.join(script_dir, src_engine),
+                                                        open(MANIFEST_xml_in).readlines())]
+    files = [ scons_py ] + manifest_files + manifest_xml_files
     
     for file in files:
         src = find(file)
diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in
index a657734f..cfbfd3af 100644
--- a/src/engine/MANIFEST-xml.in
+++ b/src/engine/MANIFEST-xml.in
@@ -4,4 +4,5 @@ SCons/Scanner/__init__.xml
 SCons/Script/*.xml
 SCons/Tool/*.xml
 SCons/Tool/docbook/__init__.xml
+SCons/Tool/docbook/utils/xmldepend.xsl
 SCons/Tool/packaging/__init__.xml
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index aecf35ed..2df278e0 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -74,10 +74,11 @@ SCons/Tool/docbook/__init__.py
 SCons/Tool/dvi.py
 SCons/Tool/dvipdf.py
 SCons/Tool/dvips.py
+SCons/Tool/f03.py
+SCons/Tool/f08.py
 SCons/Tool/f77.py
 SCons/Tool/f90.py
 SCons/Tool/f95.py
-SCons/Tool/f03.py
 SCons/Tool/filesystem.py
 SCons/Tool/fortran.py
 SCons/Tool/FortranCommon.py
-- 
cgit v1.2.1