From 65204966d0929038cd96f1acc4a5f0d4dde47ad2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 14 Sep 2009 14:48:36 -0600 Subject: [PATCH] IGN: Restore generation of external manifest files to try and fix extension laoding on Windows XP --- setup/extensions.py | 12 ++++++------ setup/publish.py | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/setup/extensions.py b/setup/extensions.py index 7682c73cba..67918255fa 100644 --- a/setup/extensions.py +++ b/setup/extensions.py @@ -16,7 +16,7 @@ from setup.build_environment import fc_inc, fc_lib, qt_inc, qt_lib, \ fc_error, poppler_libs, poppler_lib, poppler_inc, podofo_inc, \ podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \ leopard_build, QMAKE, msvc, MT, win_inc, win_lib - +MT isunix = islinux or isosx make = 'make' if isunix else NMAKE @@ -262,11 +262,11 @@ class Build(Command): print ' '.join(cmd) subprocess.check_call(cmd) if iswindows: - manifest = dest+'.manifest' - cmd = [MT, '-manifest', manifest, '-outputresource:%s;2'%dest] - self.info(*cmd) - subprocess.check_call(cmd) - os.remove(manifest) + #manifest = dest+'.manifest' + #cmd = [MT, '-manifest', manifest, '-outputresource:%s;2'%dest] + #self.info(*cmd) + #subprocess.check_call(cmd) + #os.remove(manifest) for x in ('.exp', '.lib'): x = os.path.splitext(dest)[0]+x if os.path.exists(x): diff --git a/setup/publish.py b/setup/publish.py index eaf9785ec1..cb8f5e8b06 100644 --- a/setup/publish.py +++ b/setup/publish.py @@ -34,6 +34,10 @@ class Stage2(Command): def pre_sub_commands(self, opts): for x in glob.glob(os.path.join(self.d(self.SRC), 'dist', '*')): os.remove(x) + build = os.path.join(self.d(self.SRC), 'build') + if os.path.exists(build): + shutil.rmtree(build) + class Stage3(Command):