diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-01-07 11:27:59 -0500 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-01-07 11:27:59 -0500 |
| commit | 48378d8af7ce77e60138f33bf6e572db5942ceab (patch) | |
| tree | a7cbc488ecea4fe01faf45ae61ab061447afcf7c | |
| parent | 35170015889281f21653acfc8c99e5040246b97c (diff) | |
| download | scons-git-48378d8af7ce77e60138f33bf6e572db5942ceab.tar.gz | |
Remove src/engine/MANIFEST-xml.in and logic which refers to it. Can't see why we had a seperate manifest for just the xml files which were then not included in the package, making docbook builders not work
| -rwxr-xr-x | bootstrap.py | 7 | ||||
| -rw-r--r-- | src/engine/MANIFEST-xml.in | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/bootstrap.py b/bootstrap.py index 7a4dc9108..ea7e0c836 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -178,15 +178,11 @@ 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')) - 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 + files = [scons_py] + manifest_files for filename in files: src = find(filename) @@ -214,6 +210,7 @@ def main(): sys.exit(subprocess.Popen(args, env=os.environ).wait()) + if __name__ == "__main__": main() diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in deleted file mode 100644 index cfbfd3af0..000000000 --- a/src/engine/MANIFEST-xml.in +++ /dev/null @@ -1,8 +0,0 @@ -SCons/*.xml -SCons/Platform/*.xml -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 |