Added code to point pyinstaller to the OpenLP pyinstaller hooks directory

This commit is contained in:
Stevan Pettit 2011-10-25 20:09:35 -04:00
parent a62b03dce6
commit 35875b7008

View File

@ -48,10 +48,10 @@ Inno Setup 5
Sphinx Sphinx
This is used to build the documentation. The documentation trunk must be at This is used to build the documentation. The documentation trunk must be at
the same directory level as Openlp trunk and named "documentation" the same directory level as Openlp trunk and named "documentation".
HTML Help Workshop HTML Help Workshop
This is used to create the help file This is used to create the help file.
PyInstaller PyInstaller
PyInstaller should be a checkout of revision 1470 of trunk, and in a PyInstaller should be a checkout of revision 1470 of trunk, and in a
@ -61,14 +61,10 @@ PyInstaller
To install PyInstaller, first checkout trunk from Subversion. The easiest To install PyInstaller, first checkout trunk from Subversion. The easiest
way is to install TortoiseSVN and then checkout the following URL to a way is to install TortoiseSVN and then checkout the following URL to a
directory called "pyinstaller":: directory called "pyinstaller".
http://svn.pyinstaller.org/trunk http://svn.pyinstaller.org/trunk
Then you need to copy the two hook-*.py files from the "pyinstaller"
subdirectory in OpenLP's "resources" directory into PyInstaller's
"PyInstaller/hooks" directory.
Bazaar Bazaar
You need the command line "bzr" client installed. You need the command line "bzr" client installed.
@ -79,7 +75,7 @@ OpenLP
Visual C++ 2008 Express Edition Visual C++ 2008 Express Edition
This is to build pptviewlib.dll, the library for controlling the This is to build pptviewlib.dll, the library for controlling the
PowerPointViewer PowerPointViewer.
windows-builder.py windows-builder.py
This script, of course. It should be in the "scripts" directory of OpenLP. This script, of course. It should be in the "scripts" directory of OpenLP.
@ -90,6 +86,8 @@ psvince.dll
the install will fail. The dll can be obtained from here: the install will fail. The dll can be obtained from here:
http://www.vincenzo.net/isxkb/index.php?title=PSVince) http://www.vincenzo.net/isxkb/index.php?title=PSVince)
The dll is presently included in .\resources\windows
Mako Mako
Mako Templates for Python. This package is required for building the Mako Templates for Python. This package is required for building the
remote plugin. It can be installed by going to your remote plugin. It can be installed by going to your
@ -149,6 +147,7 @@ build_path = os.path.join(branch_path, u'build')
dist_path = os.path.join(branch_path, u'dist', u'OpenLP') dist_path = os.path.join(branch_path, u'dist', u'OpenLP')
pptviewlib_path = os.path.join(source_path, u'plugins', u'presentations', pptviewlib_path = os.path.join(source_path, u'plugins', u'presentations',
u'lib', u'pptviewlib') u'lib', u'pptviewlib')
hooks_path = os.path.join(branch_path , u'resources', u'pyinstaller')
def update_code(): def update_code():
os.chdir(branch_path) os.chdir(branch_path)
@ -174,6 +173,7 @@ def run_pyinstaller():
u'--noconfirm', u'--noconfirm',
u'--windowed', u'--windowed',
u'--noupx', u'--noupx',
u'--additional-hooks-dir', hooks_path,
u'-o', branch_path, u'-o', branch_path,
u'-i', win32_icon, u'-i', win32_icon,
u'-p', branch_path, u'-p', branch_path,