Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

IGN: Restore generation of external manifest files to try and fix extension laoding on Windows XP

Browse Source
This commit is contained in:
Kovid Goyal 2009-09-14 14:48:36 -06:00
parent aa61d8892e
commit 65204966d0
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup/extensions.py
View File

@ -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, \ fc_error, poppler_libs, poppler_lib, poppler_inc, podofo_inc, \
podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \ podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \
leopard_build, QMAKE, msvc, MT, win_inc, win_lib leopard_build, QMAKE, msvc, MT, win_inc, win_lib
MT
isunix = islinux or isosx isunix = islinux or isosx
make = 'make' if isunix else NMAKE make = 'make' if isunix else NMAKE
@ -262,11 +262,11 @@ class Build(Command):
print ' '.join(cmd) print ' '.join(cmd)
subprocess.check_call(cmd) subprocess.check_call(cmd)
if iswindows: if iswindows:
manifest = dest+'.manifest' #manifest = dest+'.manifest'
cmd = [MT, '-manifest', manifest, '-outputresource:%s;2'%dest] #cmd = [MT, '-manifest', manifest, '-outputresource:%s;2'%dest]
self.info(*cmd) #self.info(*cmd)
subprocess.check_call(cmd) #subprocess.check_call(cmd)
os.remove(manifest) #os.remove(manifest)
for x in ('.exp', '.lib'): for x in ('.exp', '.lib'):
x = os.path.splitext(dest)[0]+x x = os.path.splitext(dest)[0]+x
if os.path.exists(x): if os.path.exists(x):

4
setup/publish.py
View File

@ -34,6 +34,10 @@ class Stage2(Command):
def pre_sub_commands(self, opts): def pre_sub_commands(self, opts):
for x in glob.glob(os.path.join(self.d(self.SRC), 'dist', '*')): for x in glob.glob(os.path.join(self.d(self.SRC), 'dist', '*')):
os.remove(x) os.remove(x)
build = os.path.join(self.d(self.SRC), 'build')
if os.path.exists(build):
shutil.rmtree(build)
class Stage3(Command): class Stage3(Command):