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

version 0.5.12

Browse Source
This commit is contained in:
Kovid Goyal 2009-05-15 12:59:48 -07:00
parent a4dc51b30d
commit a3e2e0ab4c
7 changed files with 6062 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyqtdistutils.py
View File

@ -144,7 +144,7 @@ CONFIG += x86 ppc
return _build_ext.build_extension(self, ext) return _build_ext.build_extension(self, ext)
c_sources = [f for f in ext.sources if os.path.splitext(f)[1].lower() in ('.c', '.cpp', '.cxx')] c_sources = [f for f in ext.sources if os.path.splitext(f)[1].lower() in ('.c', '.cpp', '.cxx')]
compile_args = '/c /nologo /Ox /MD /W3 /GX /DNDEBUG'.split() compile_args = '/c /nologo /Ox /MD /W3 /EHsc /DNDEBUG'.split()
compile_args += ext.extra_compile_args compile_args += ext.extra_compile_args
self.swig_opts = '' self.swig_opts = ''
inc_dirs = self.include_dirs + [x.replace('/', '\\') for x in ext.include_dirs] inc_dirs = self.include_dirs + [x.replace('/', '\\') for x in ext.include_dirs]
@ -153,11 +153,12 @@ CONFIG += x86 ppc
for f in c_sources: for f in c_sources:
o = os.path.join(bdir, os.path.basename(f)+'.obj') o = os.path.join(bdir, os.path.basename(f)+'.obj')
objects.append(o) objects.append(o)
compiler = cc + ['/Tc'+f, '/Fo'+o] inf = '/Tp' if f.endswith('.cpp') else '/Tc'
compiler = cc + [inf+f, '/Fo'+o]
self.spawn(compiler) self.spawn(compiler)
out = os.path.join(bdir, base+'.pyd') out = os.path.join(bdir, base+'.pyd')
linker = [msvc.linker] + '/DLL /nologo /INCREMENTAL:NO'.split() linker = [msvc.linker] + '/DLL /nologo /INCREMENTAL:NO'.split()
linker += ['/LIBPATH:'+x for x in self.library_dirs] linker += ['/LIBPATH:'+x for x in self.library_dirs+ext.library_dirs]
linker += [x+'.lib' for x in ext.libraries] linker += [x+'.lib' for x in ext.libraries]
linker += ['/EXPORT:init'+base] + objects + ['/OUT:'+out] linker += ['/EXPORT:init'+base] + objects + ['/OUT:'+out]
self.spawn(linker) self.spawn(linker)

3
setup.py
View File

@ -66,10 +66,9 @@ if __name__ == '__main__':
podofo_lib = '/usr/lib' if islinux else r'C:\podofo' if iswindows else \ podofo_lib = '/usr/lib' if islinux else r'C:\podofo' if iswindows else \
'/Users/kovid/podofo/lib' '/Users/kovid/podofo/lib'
if os.path.exists(os.path.join(podofo_inc, 'podofo.h')): if os.path.exists(os.path.join(podofo_inc, 'podofo.h')):
eca = ['/EHsc'] if iswindows else []
optional.append(Extension('calibre.plugins.podofo', optional.append(Extension('calibre.plugins.podofo',
sources=['src/calibre/utils/podofo/podofo.cpp'], sources=['src/calibre/utils/podofo/podofo.cpp'],
libraries=['podofo'], extra_compile_args=eca, libraries=['podofo'],
library_dirs=[os.environ.get('PODOFO_LIB_DIR', podofo_lib)], library_dirs=[os.environ.get('PODOFO_LIB_DIR', podofo_lib)],
include_dirs=\ include_dirs=\
[os.environ.get('PODOFO_INC_DIR', podofo_inc)])) [os.environ.get('PODOFO_INC_DIR', podofo_inc)]))

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.5.11' __version__ = '0.5.12'
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
''' '''
Various run time constants. Various run time constants.

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

@ -400,7 +400,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
pix = QPixmap() pix = QPixmap()
pix.loadFromData(self.cover_fetcher.cover_data) pix.loadFromData(self.cover_fetcher.cover_data)
if pix.isNull(): if pix.isNull():
error_dialog(self.window, _('Bad cover'), error_dialog(self, _('Bad cover'),
_('The cover is not a valid picture')).exec_() _('The cover is not a valid picture')).exec_()
else: else:
self.cover.setPixmap(pix) self.cover.setPixmap(pix)

6052
src/calibre/translations/calibre.pot Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/calibre/utils/podofo/podofo.cpp
View File

@ -6,8 +6,6 @@
#include <podofo.h> #include <podofo.h>
using namespace PoDoFo; using namespace PoDoFo;
#include <string.h>
class podofo_pdfmem_wrapper : public PdfMemDocument { class podofo_pdfmem_wrapper : public PdfMemDocument {
public: public:
inline void set_info(PdfInfo *i) { this->SetInfo(i); } inline void set_info(PdfInfo *i) { this->SetInfo(i); }

5
upload.py
View File

@ -99,11 +99,11 @@ class pot(OptionlessCommand):
tempdir = tempfile.mkdtemp() tempdir = tempfile.mkdtemp()
pygettext(buf, ['-k', '__', '-p', tempdir]+files) pygettext(buf, ['-k', '__', '-p', tempdir]+files)
src = buf.getvalue() src = buf.getvalue()
pot = os.path.join(tempdir, __appname__+'.pot') pot = os.path.join(self.PATH, __appname__+'.pot')
f = open(pot, 'wb') f = open(pot, 'wb')
f.write(src) f.write(src)
f.close() f.close()
print 'Translations template:', pot print 'Translations template:', os.path.abspath(pot)
return pot return pot
finally: finally:
sys.path.remove(os.path.abspath(self.PATH)) sys.path.remove(os.path.abspath(self.PATH))
@ -707,6 +707,7 @@ class upload(OptionlessCommand):
description = 'Build and upload calibre to the servers' description = 'Build and upload calibre to the servers'
sub_commands = [ sub_commands = [
('pot', None),
('stage1', None), ('stage1', None),
('stage2', None), ('stage2', None),
('stage3', None) ('stage3', None)