New upstream version 3.0.0upstream/3.0.0

1 files changed, 10 insertions, 4 deletions

diff --git a/bootstrap.py b/bootstrap.py
index 26ef90e..58fde15 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -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)