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

IGN:...

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-21 16:30:02 -06:00
parent 786021e6a6
commit ae0274ceab
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
installer/windows/freeze.py
View File

@ -91,7 +91,6 @@ class BuildEXE(py2exe.build_exe.py2exe):
print print
print 'Adding third party dependencies' print 'Adding third party dependencies'
print '\tAdding devcon'
tdir = os.path.join(PY2EXE_DIR, 'driver') tdir = os.path.join(PY2EXE_DIR, 'driver')
os.makedirs(tdir) os.makedirs(tdir)
for pat in ('*.dll', '*.sys', '*.cat', '*.inf'): for pat in ('*.dll', '*.sys', '*.cat', '*.inf'):
@ -104,11 +103,6 @@ class BuildEXE(py2exe.build_exe.py2exe):
'bin\\freetype.dll', 'bin\\jpeg62.dll'): 'bin\\freetype.dll', 'bin\\jpeg62.dll'):
shutil.copyfile(os.path.join(POPPLER, x), shutil.copyfile(os.path.join(POPPLER, x),
os.path.join(PY2EXE_DIR, os.path.basename(x))) os.path.join(PY2EXE_DIR, os.path.basename(x)))
#shutil.copyfile(PDFTOHTML, os.path.join(PY2EXE_DIR, os.path.basename(PDFTOHTML)))
#shutil.copyfile(PDFTOHTML+'.manifest', os.path.join(PY2EXE_DIR,
# os.path.basename(PDFTOHTML)+'.manifest'))
#print '\tAdding pdftk'
#shutil.copyfile(PDFTK, os.path.join(PY2EXE_DIR, os.path.basename(PDFTK)))
print '\tAdding podofo' print '\tAdding podofo'
for f in glob.glob(os.path.join(PODOFO, '*.dll')): for f in glob.glob(os.path.join(PODOFO, '*.dll')):
shutil.copyfile(f, os.path.join(PY2EXE_DIR, os.path.basename(f))) shutil.copyfile(f, os.path.join(PY2EXE_DIR, os.path.basename(f)))

2
src/calibre/gui2/dialogs/metadata_single.py
View File

@ -92,7 +92,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
def select_cover(self, checked): def select_cover(self, checked):
files = choose_images(self, 'change cover dialog', files = choose_images(self, 'change cover dialog',
u'Choose cover for ' + qstring_to_unicode(self.title.text())) _('Choose cover for ') + unicode(self.title.text()))
if not files: if not files:
return return
_file = files[0] _file = files[0]

2
src/calibre/manual/qthelp.py
View File

@ -160,7 +160,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
sections.extend(self.write_toc(node)) sections.extend(self.write_toc(node))
if self.config.html_use_modindex: if self.config.html_use_modindex:
item = section_template % {'title': _('Global Module Index'), item = section_template % {'title': 'Global Module Index',
'ref': 'modindex.html'} 'ref': 'modindex.html'}
sections.append(' '*4*4 + item) sections.append(' '*4*4 + item)
sections = '\n'.join(sections) sections = '\n'.join(sections)

7
upload.py
View File

@ -123,8 +123,8 @@ class manual(OptionlessCommand):
os.makedirs(d) os.makedirs(d)
if not os.path.exists('.build'+os.sep+'html'): if not os.path.exists('.build'+os.sep+'html'):
os.makedirs('.build'+os.sep+'html') os.makedirs('.build'+os.sep+'html')
check_call(['sphinx-build', '-b', 'custom', '-d', '-t', 'online', check_call(['sphinx-build', '-b', 'custom', '-t', 'online',
'.build/doctrees', '.', '.build/html']) '-d', '.build/doctrees', '.', '.build/html'])
check_call(['sphinx-build', '-b', 'epub', '-d', check_call(['sphinx-build', '-b', 'epub', '-d',
'.build/doctrees', '.', '.build/epub']) '.build/doctrees', '.', '.build/epub'])
j = os.path.join j = os.path.join
@ -706,6 +706,9 @@ class stage3(OptionlessCommand):
shell=True) shell=True)
check_call('ssh divok bzr update /usr/local/calibre', check_call('ssh divok bzr update /usr/local/calibre',
shell=True) shell=True)
check_call('ssh divok /etc/init.d/apache2 graceful',
shell=True)
def run(self): def run(self):