From 9e50db27c075db26663b046622a66b04d7a41b1d Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Sun, 30 Dec 2012 23:55:44 +0100 Subject: [PATCH] Add runtime hook for osx and windows builds. For osx produce 64bit binary. --- osx/config.ini.default | 2 +- osx/macosx-builder.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/osx/config.ini.default b/osx/config.ini.default index 4445e64..ee28bf2 100644 --- a/osx/config.ini.default +++ b/osx/config.ini.default @@ -11,7 +11,7 @@ branch = %(projects)s/trunk documentation = %(projects)s/documentation macicon = %(here)s/OpenLP.icns bundleinfo = %(here)s/Info.plist -hooks = resources/pyinstaller +hooks = %(here)s/../pyinstaller-hooks dmg_background = %(here)s/DmgImageInstallBackground.png [transifex] diff --git a/osx/macosx-builder.py b/osx/macosx-builder.py index ef25dd8..792ad9d 100644 --- a/osx/macosx-builder.py +++ b/osx/macosx-builder.py @@ -332,13 +332,14 @@ class MacosxBuilder(object): """ self._print(u'Running PyInstaller...') os.chdir(self.branch_path) - # arch -i386 ensures 32bit build is created. - pyinstaller = Popen(('arch', '-i386', self.python, + pyinstaller = Popen((self.python, self.pyinstaller, u'--noconfirm', u'--windowed', u'--noupx', u'--additional-hooks-dir', self.hooks_path, + u'--runtime-hook', os.path.join(self.hooks_path, + 'rthook_openlp_pyqt4.py'), u'--log-level=ERROR', u'-o', self.branch_path, #u'-i', self.mac_icon,