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:b11

Browse Source
This commit is contained in:
Kovid Goyal 2008-09-10 19:07:30 -07:00
parent 9c1f340ee6
commit ffd2bfa477
4 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
installer/osx/freeze.py
View File

@ -48,7 +48,7 @@ os.chmod(loader_path, 0700)
os.environ['PYTHONHOME'] = resources_dir os.environ['PYTHONHOME'] = resources_dir
os.environ['FC_CONFIG_DIR'] = os.path.join(resources_dir, 'fonts') os.environ['FC_CONFIG_DIR'] = os.path.join(resources_dir, 'fonts')
os.environ['MAGICK_HOME'] = os.path.join(frameworks_dir, 'ImageMagick') os.environ['MAGICK_HOME'] = os.path.join(frameworks_dir, 'ImageMagick')
os.environ['DYLD_LIBRARY_PATH'] = '%%s:%%s'%%(frameworks_dir, os.path.join(frameworks_dir, 'ImageMagick', 'lib')) os.environ['DYLD_LIBRARY_PATH'] = os.path.join(frameworks_dir, 'ImageMagick', 'lib')
os.execv(loader_path, sys.argv) os.execv(loader_path, sys.argv)
''' '''
CHECK_SYMLINKS_PRESCRIPT = \ CHECK_SYMLINKS_PRESCRIPT = \
@ -218,13 +218,6 @@ _check_symlinks_prescript()
self.fix_misc_dependencies(deps) self.fix_misc_dependencies(deps)
def fix_lxml_dependencies(self, resource_dir):
for f in glob.glob(os.path.join(resource_dir, 'lib', 'python*', 'lxml', '*.so')):
print 'Fixing dependencies of', os.path.basename(f)
for lib in ('libxml2.2.dylib', 'libxslt.1.dylib', 'libexslt.0.dylib'):
subprocess.check_call(['/usr/bin/install_name_tool', '-change',
'/usr/local/lib/%s'%lib, '@executable_path/../Frameworks/%s'%lib, f])
def run(self): def run(self):
py2app.run(self) py2app.run(self)
resource_dir = os.path.join(self.dist_dir, resource_dir = os.path.join(self.dist_dir,
@ -263,18 +256,6 @@ _check_symlinks_prescript()
shutil.rmtree(dst) shutil.rmtree(dst)
shutil.copytree('/usr/local/etc/fonts', dst, symlinks=False) shutil.copytree('/usr/local/etc/fonts', dst, symlinks=False)
print
print 'Adding lxml dependencies'
#shutil.copyfile('/usr/lib/libiconv.2.dylib', os.path.join(frameworks_dir, 'libiconv.2.dylib'))
#subprocess.check_call('install_name_tool -id @executable_path/../Frameworks/libiconv.2.dylib '+ os.path.join(frameworks_dir, 'libiconv.2.dylib'), shell=True)
deps = []
for f in glob.glob(os.path.expanduser('~/libxml2/*')):
tgt = os.path.join(frameworks_dir, os.path.basename(f))
shutil.copyfile(f, tgt)
deps.append(tgt)
self.fix_lxml_dependencies(resource_dir)
self.fix_misc_dependencies(deps)
print print
print 'Adding IPython' print 'Adding IPython'
dst = os.path.join(resource_dir, 'lib', 'python2.5', 'IPython') dst = os.path.join(resource_dir, 'lib', 'python2.5', 'IPython')
@ -350,7 +331,7 @@ def main():
'LSEnvironment':{ 'LSEnvironment':{
'FC_CONFIG_DIR':'@executable_path/../Resources/fonts', 'FC_CONFIG_DIR':'@executable_path/../Resources/fonts',
'MAGICK_HOME':'@executable_path/../Frameworks/ImageMagick', 'MAGICK_HOME':'@executable_path/../Frameworks/ImageMagick',
'DYLD_LIBRARY_PATH':'@executable_path/../Frameworks:@executable_path/../Frameworks/ImageMagick/lib', 'DYLD_LIBRARY_PATH':'@executable_path/../Frameworks/ImageMagick/lib',
} }
}, },
}, },

2
src/calibre/constants.py
View File

@ -2,7 +2,7 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
__appname__ = 'calibre' __appname__ = 'calibre'
__version__ = '0.4.84b10' __version__ = '0.4.84b11'
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
''' '''
Various run time constants. Various run time constants.

2
src/calibre/ebooks/mobi/reader.py
View File

@ -176,7 +176,7 @@ class MobiReader(object):
self.processed_html = \ self.processed_html = \
re.compile('<head>', re.IGNORECASE).sub( re.compile('<head>', re.IGNORECASE).sub(
'<head>\n' '\n<head>\n'
'<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n' '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n'
'<style type="text/css">\n' '<style type="text/css">\n'
'blockquote { margin: 0em 0em 0em 1.25em; text-align: justify; }\n' 'blockquote { margin: 0em 0em 0em 1.25em; text-align: justify; }\n'

4
src/calibre/manual/faq.rst
View File

@ -131,7 +131,7 @@ The graphical user interface of |app| is not starting on Windows?
There can be several causes for this: There can be several causes for this:
* **Any windows version**: Try running it as Administrator (Right click on the icon ans select "Run as Administrator") * **Any windows version**: Try running it as Administrator (Right click on the icon ans select "Run as Administrator")
* **Any windows version**: Search for the files `calibre2.ini` and `calibre.ini` on your computer and delete them. Search for the file `library1.db` and rename it (this file contains all your converted books so deleting it is not a good idea). Now try again. * **Any windows version**: If this happens during an initial run of calibre, try deleting the folder you chose for your ebooks and restarting calibre.
* **Windows Vista**: If the folder :file:`C:\\Users\\Your User Name\\AppData\\Local\\VirtualStore\\Program Files\\calibre` exists, delete it. Uninstall |app|. Reboot. Re-install. * **Windows Vista**: If the folder :file:`C:\\Users\\Your User Name\\AppData\\Local\\VirtualStore\\Program Files\\calibre` exists, delete it. Uninstall |app|. Reboot. Re-install.
* **Any windows version**: Search your computer for a folder named :file:`_ipython`. Delete it and try again. * **Any windows version**: Search your computer for a folder named :file:`_ipython`. Delete it and try again.
@ -139,7 +139,7 @@ If it still wont launch, start a command prompt (press the windows key and R; th
calibre-debug -c "from calibre.gui2.main import main; main()" calibre-debug -c "from calibre.gui2.main import main; main()"
Post any output you see in a help message on the `Forums <http://calibre.kovidgoyal.net/discussion>`_. Post any output you see in a help message on the `Forum <http://www.mobileread.com/forums/forumdisplay.php?f=166>`_.
I want some feature added to |app|. What can I do? I want some feature added to |app|. What can I do?