raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fixed line length

Browse Source 
removed old pyinstaller version comments
This commit is contained in:
Matthias Hub 2011-02-14 22:55:38 +01:00
parent 31ddfe24d5
commit 628bb0adbe
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp.pyw
View File

@ -274,7 +274,8 @@ def main():
# Now create and actually run the application. # Now create and actually run the application.
app = OpenLP(qt_args) app = OpenLP(qt_args)
if sys.platform == 'darwin': if sys.platform == 'darwin':
OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath() + "/qt4_plugins") OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath()
+ "/qt4_plugins")
#i18n Set Language #i18n Set Language
language = LanguageManager.get_language() language = LanguageManager.get_language()
appTranslator = LanguageManager.get_translator(language) appTranslator = LanguageManager.get_translator(language)

28
resources/osx/build.py
View File

@ -35,28 +35,28 @@ Python 2.6
This build script only works with Python 2.6. This build script only works with Python 2.6.
PyQt4 PyQt4
You should already have this installed, OpenLP doesn't work without it. The You should already have this installed, OpenLP doesn't work without it.
version the script expects is the packaged one available from River Bank The version the script expects is the packaged one available from River
Computing. Bank Computing.
PyInstaller PyInstaller
PyInstaller should be a checkout of revision 1355 of trunk, and in a PyInstaller should be a checkout of revision 1355 of trunk, and in a
directory which is configured in the openlp.cfg. The revision is very directory which is configured in the openlp.cfg. The revision is very
important as there is just included a fix for builds on OS X. important as there is just included a fix for builds on OS X.
To install PyInstaller, first checkout trunk from Subversion. The easiest To install PyInstaller, first checkout trunk from Subversion. The
way is to do a easiest way is to do a
svn co http://svn.pyinstaller.org/trunk svn co http://svn.pyinstaller.org/trunk
Then you need to copy the two hook-*.py files from the "pyinstaller" Then you need to copy the two hook-*.py files from the "pyinstaller"
subdirectory in OpenLP's "resources" directory into PyInstaller's "hooks" subdirectory in OpenLP's "resources" directory into PyInstaller's
directory. "hooks" directory.
openlp.cfg openlp.cfg
The configuration file contains settings of the version string to include The configuration file contains settings of the version string to include
in the bundle as well as directory and file settings for different purposes in the bundle as well as directory and file settings for different
(e.g. PyInstaller location or installer background image) purposes (e.g. PyInstaller location or installer background image)
To start the build process do a To start the build process do a
@ -111,16 +111,6 @@ def build_application(settings, app_name_lower, app_dir):
sys.exit(1) sys.exit(1)
dist_folder = os.getcwd() + '/dist/' + app_name_lower dist_folder = os.getcwd() + '/dist/' + app_name_lower
# logging.info('[%s] copying the additional app files (from %s)...',
# script_name, dist_folder)
# result = os.system('cp -R %(dist_directory)s/* '
# + '%(application_directory)s/Contents/MacOS' \
# % { 'dist_directory' : dist_folder,
# 'application_directory' : app_dir })
# if (result != 0):
# logging.error('[%s] could not copy additional files, cannot '
# + 'continue!', script_name)
# sys.exit(1)
logging.info('[%s] copying the new plugins...', script_name) logging.info('[%s] copying the new plugins...', script_name)
result = os.system('cp -R %(openlp_directory)s/openlp/plugins \ result = os.system('cp -R %(openlp_directory)s/openlp/plugins \