From 509d78c0a6bc182fbb3d069bfecf342b78ad983e Mon Sep 17 00:00:00 2001 From: Paweł Jastrzębski Date: Fri, 17 Jan 2014 12:25:20 +0100 Subject: Updated OSX setup --- other/qt.conf | 3 +++ setup.py | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 other/qt.conf diff --git a/other/qt.conf b/other/qt.conf new file mode 100644 index 0000000..d9a44c7 --- /dev/null +++ b/other/qt.conf @@ -0,0 +1,3 @@ +; Qt Configuration file +[Paths] +Plugins = PlugIns diff --git a/setup.py b/setup.py index dbea2f2..c8a6e38 100644 --- a/setup.py +++ b/setup.py @@ -23,12 +23,9 @@ if platform == "darwin": py2app=dict( argv_emulation=True, iconfile='icons/comic2ebook.icns', - includes=['PIL', 'sip', 'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtNetwork'], - qt_plugins=[], - excludes=['PyQt4.QtDeclarative', 'PyQt4.QtDesigner', 'PyQt4.QtHelp', 'PyQt4.QtMultimedia', - 'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtScriptTools', 'PyQt4.QtSql', 'PyQt4.QtSvg', - 'PyQt4.QtXmlPatterns', 'PyQt4.QtXml', 'PyQt4.QtWebKit', 'PyQt4.QtTest', 'Tkinter'], - resources=['LICENSE.txt', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'], + includes=['PIL', 'sip', 'PyQt5', 'PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtNetwork', 'PyQt5.QtWidgets', + 'PyQt5.QtPrintSupport'], + resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'], plist=dict( CFBundleName=NAME, CFBundleShortVersionString=VERSION, @@ -90,6 +87,9 @@ setup( ) if platform == "darwin": - from os import chmod + from os import chmod, makedirs + from shutil import copyfile + makedirs('dist/' + NAME + '.app/Contents/PlugIns/platform') + copyfile('other/libqcocoa.dylib', 'dist/' + NAME + '.app/Contents/PlugIns/platform') chmod('dist/' + NAME + '.app/Contents/Resources/unrar', 0o777) chmod('dist/' + NAME + '.app/Contents/Resources/7za', 0o777) \ No newline at end of file -- cgit 1.4.1