Add src/engine/SCons/Tool/docbook/utils/xmldepend.xsl to MANIFEST-xml.in

diff --git a/SConstruct b/SConstruct
index b14fe45548e7778919abf7458aa689c45a3a0a4d..4ec354538e7d811f141966abb244315474667368 100644 (file)
--- 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 08df11db206bc6852ab5bb727aad0723fff91518..086270cb2d27d98bc810ef46b96c7ec39ec777ab 100755 (executable)
--- 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 a657734f00f2ec0c97d92e20bcf660f11e36129b..cfbfd3af0ff5948d5ca57ab43e160b4852687865 100644 (file)
--- 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 aecf35ed74d7a993eef749868f2c0ccd5c1ffa99..2df278e02c81fe898467e37fe40bbf0489c14ec6 100644 (file)
--- 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