From 35875b700809378f530c04a668c65bbed4102c12 Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Tue, 25 Oct 2011 20:09:35 -0400 Subject: [PATCH 1/3] Added code to point pyinstaller to the OpenLP pyinstaller hooks directory --- scripts/windows-builder.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py index b7bf70472..b94ba93cc 100644 --- a/scripts/windows-builder.py +++ b/scripts/windows-builder.py @@ -48,10 +48,10 @@ Inno Setup 5 Sphinx 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 - This is used to create the help file + This is used to create the help file. PyInstaller 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 way is to install TortoiseSVN and then checkout the following URL to a - directory called "pyinstaller":: + directory called "pyinstaller". 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 You need the command line "bzr" client installed. @@ -79,7 +75,7 @@ OpenLP Visual C++ 2008 Express Edition This is to build pptviewlib.dll, the library for controlling the - PowerPointViewer + PowerPointViewer. windows-builder.py This script, of course. It should be in the "scripts" directory of OpenLP. @@ -89,6 +85,8 @@ psvince.dll running on the users machine prior to the setup. If OpenLP is running, the install will fail. The dll can be obtained from here: http://www.vincenzo.net/isxkb/index.php?title=PSVince) + + The dll is presently included in .\resources\windows Mako Mako Templates for Python. This package is required for building the @@ -149,6 +147,7 @@ build_path = os.path.join(branch_path, u'build') dist_path = os.path.join(branch_path, u'dist', u'OpenLP') pptviewlib_path = os.path.join(source_path, u'plugins', u'presentations', u'lib', u'pptviewlib') +hooks_path = os.path.join(branch_path , u'resources', u'pyinstaller') def update_code(): os.chdir(branch_path) @@ -173,7 +172,8 @@ def run_pyinstaller(): pyinstaller = Popen((python_exe, pyi_build, u'--noconfirm', u'--windowed', - u'--noupx', + u'--noupx', + u'--additional-hooks-dir', hooks_path, u'-o', branch_path, u'-i', win32_icon, u'-p', branch_path, From fe3453a7a5f2b7810dc3a3800409cab9dfe8434d Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Thu, 27 Oct 2011 17:06:40 -0400 Subject: [PATCH 2/3] Fixed the documentation section of the script --- scripts/windows-builder.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py index b94ba93cc..170d15e83 100644 --- a/scripts/windows-builder.py +++ b/scripts/windows-builder.py @@ -61,7 +61,7 @@ PyInstaller To install PyInstaller, first checkout trunk from Subversion. The easiest way is to install TortoiseSVN and then checkout the following URL to a - directory called "pyinstaller". + directory called "pyinstaller":: http://svn.pyinstaller.org/trunk @@ -83,17 +83,19 @@ windows-builder.py psvince.dll This dll is used during the actual install of OpenLP to check if OpenLP is running on the users machine prior to the setup. If OpenLP is running, - the install will fail. The dll can be obtained from here: - http://www.vincenzo.net/isxkb/index.php?title=PSVince) + the install will fail. The dll can be obtained from here:: + + http://www.vincenzo.net/isxkb/index.php?title=PSVince) - The dll is presently included in .\resources\windows + The dll is presently included in .\\resources\\windows Mako Mako Templates for Python. This package is required for building the remote plugin. It can be installed by going to your python_directory\scripts\.. and running "easy_install Mako". If you do not - have easy_install, the Mako package can be obtained here: - http://www.makotemplates.org/download.html + have easy_install, the Mako package can be obtained here:: + + http://www.makotemplates.org/download.html """ From f522c79b1ea90b4d3f08d75a5d86a2baf3066e8b Mon Sep 17 00:00:00 2001 From: Stevan Pettit Date: Fri, 28 Oct 2011 09:28:57 -0400 Subject: [PATCH 3/3] Added sqlalchemy-migrate to comments section. Made some changes to comments section to preserve links. --- scripts/windows-builder.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py index 170d15e83..9076971cb 100644 --- a/scripts/windows-builder.py +++ b/scripts/windows-builder.py @@ -83,7 +83,7 @@ windows-builder.py psvince.dll This dll is used during the actual install of OpenLP to check if OpenLP is running on the users machine prior to the setup. If OpenLP is running, - 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) @@ -93,10 +93,16 @@ Mako Mako Templates for Python. This package is required for building the remote plugin. It can be installed by going to your python_directory\scripts\.. and running "easy_install Mako". If you do not - have easy_install, the Mako package can be obtained here:: + have easy_install, the Mako package can be obtained here: http://www.makotemplates.org/download.html - + +Sqlalchemy Migrate + Required for the data-bases used in OpenLP. The package can be + obtained here: + + http://code.google.com/p/sqlalchemy-migrate/ + """ import os