Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1419 (sudo calibre_postinstall error) and include ImageMagick in linux binary installer

Browse Source
This commit is contained in:
Kovid Goyal 2008-12-21 21:04:23 -08:00
parent 81f2edc740
commit 30e98dc705
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/linux/freeze.py
View File

@ -36,7 +36,9 @@ def freeze():
'/usr/lib/libpoppler.so.4', '/usr/lib/libpoppler.so.4',
'/usr/lib/libxml2.so.2', '/usr/lib/libxml2.so.2',
'/usr/lib/libxslt.so.1', '/usr/lib/libxslt.so.1',
'/usr/lib/libxslt.so.1' '/usr/lib/libxslt.so.1',
'/usr/lib/libMagickWand.so',
'/usr/lib/libMagickCore.so',
] ]
binary_includes += [os.path.join(QTDIR, 'lib%s.so.4'%x) for x in QTDLLS] binary_includes += [os.path.join(QTDIR, 'lib%s.so.4'%x) for x in QTDLLS]
@ -158,8 +160,8 @@ def freeze():
dest = os.path.join(dest_dir, os.path.basename(src)) dest = os.path.join(dest_dir, os.path.basename(src))
if not os.path.exists(dest_dir): if not os.path.exists(dest_dir):
os.makedirs(dest_dir) os.makedirs(dest_dir)
shutil.copyfile(src, dest) shutil.copyfile(os.path.realpath(src), dest)
shutil.copymode(src, dest) shutil.copymode(os.path.realpath(src), dest)
for f in binary_includes: for f in binary_includes:
copy_binary(f, FREEZE_DIR) copy_binary(f, FREEZE_DIR)

4
upload.py
View File

@ -235,10 +235,10 @@ def stage_three():
print 'Uploading to PyPI...' print 'Uploading to PyPI...'
check_call('rm -f dist/*') check_call('rm -f dist/*')
check_call('python setup.py register') check_call('python setup.py register')
check_call('sudo rm -rf build') check_call('sudo rm -rf build src/calibre/plugins/*')
os.mkdir('build') os.mkdir('build')
check_call('python2.5 setup.py bdist_egg --exclude-source-files upload') check_call('python2.5 setup.py bdist_egg --exclude-source-files upload')
shutil.rmtree('build') check_call('sudo rm -rf build src/calibre/plugins/*')
os.mkdir('build') os.mkdir('build')
check_call('python setup.py bdist_egg --exclude-source-files upload') check_call('python setup.py bdist_egg --exclude-source-files upload')
check_call('python setup.py sdist upload') check_call('python setup.py sdist upload')