From 48378d8af7ce77e60138f33bf6e572db5942ceab Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 11:27:59 -0500 Subject: 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 --- bootstrap.py | 7 ++----- src/engine/MANIFEST-xml.in | 8 -------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 src/engine/MANIFEST-xml.in diff --git a/bootstrap.py b/bootstrap.py index 7a4dc91..ea7e0c8 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 cfbfd3a..0000000 --- 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 -- cgit v0.12