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

Ad QT Curve to the windows and OS X builds

Browse Source
This commit is contained in:
Kovid Goyal 2012-05-31 20:11:19 +05:30
parent 41502a9c49
commit 415f08afd9
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/installer/osx/app/main.py
View File

@ -296,6 +296,10 @@ class Py2App(object):
self.add_qt_framework(f) self.add_qt_framework(f)
for d in glob.glob(join(SW, 'qt', 'plugins', '*')): for d in glob.glob(join(SW, 'qt', 'plugins', '*')):
shutil.copytree(d, join(self.contents_dir, 'MacOS', basename(d))) shutil.copytree(d, join(self.contents_dir, 'MacOS', basename(d)))
sty = join(self.contents_dir, 'MacOS', 'styles')
os.mkdir(sty)
shutil.copyfile(glob.glob(join(SW, 'build', 'QtCurve*', 'build', 'style',
'qtcurve.so'))[-1], join(sty, 'qtcurve.dylib'))
for l in glob.glob(join(self.contents_dir, 'MacOS', '*/*.dylib')): for l in glob.glob(join(self.contents_dir, 'MacOS', '*/*.dylib')):
self.fix_dependencies_in_lib(l) self.fix_dependencies_in_lib(l)
x = os.path.relpath(l, join(self.contents_dir, 'MacOS')) x = os.path.relpath(l, join(self.contents_dir, 'MacOS'))

9
setup/installer/windows/freeze.py
View File

@ -16,6 +16,7 @@ from setup.installer.windows.wix import WixMixIn
OPENSSL_DIR = r'Q:\openssl' OPENSSL_DIR = r'Q:\openssl'
QT_DIR = 'Q:\\Qt\\4.8.1' QT_DIR = 'Q:\\Qt\\4.8.1'
QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
QTCURVE = r'C:\plugins\styles'
LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
SW = r'C:\cygwin\home\kovid\sw' SW = r'C:\cygwin\home\kovid\sw'
IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.7.6', IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.7.6',
@ -247,6 +248,14 @@ class Win32Freeze(Command, WixMixIn):
if os.path.exists(tg): if os.path.exists(tg):
shutil.rmtree(tg) shutil.rmtree(tg)
shutil.copytree(imfd, tg) shutil.copytree(imfd, tg)
self.info('\nAdding QtCurve...')
qtcurve = self.j(QTCURVE, 'qtcurve.dll')
tg = self.j(tdir, 'styles')
if os.path.exists(tg):
shutil.rmtree(tg)
os.mkdir(tg)
shutil.copy2(qtcurve, tg)
for dirpath, dirnames, filenames in os.walk(tdir): for dirpath, dirnames, filenames in os.walk(tdir):
for x in filenames: for x in filenames:
if not x.endswith('.dll'): if not x.endswith('.dll'):

8
setup/installer/windows/notes.rst
View File

@ -101,6 +101,14 @@ Now, run configure and make::
Add the path to the bin folder inside the Qt dir to your system PATH. Add the path to the bin folder inside the Qt dir to your system PATH.
Now build QtCurve
cd qmake
edit the qmake.pro file setting the TARGET to Release
qmake && nmake
The plugin will be in c:\plugins\styles
SIP SIP
----- -----