openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/windows-updates into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/windows-updates/+merge/67238

Updated the Windows build script to work with the latest SVN PyInstaller.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/windows-updates/+merge/67238
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/windows-updates into lp:openlp.

=== modified file 'scripts/windows-builder.py'
--- scripts/windows-builder.py	2011-07-04 12:04:50 +0000
+++ scripts/windows-builder.py	2011-07-07 18:31:29 +0000
@@ -96,7 +96,7 @@
     the install will fail.  The dll can be obtained from here:
     http://www.vincenzo.net/isxkb/index.php?title=PSVince)
 
-Mako    
+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
@@ -133,7 +133,14 @@
 pyi_build = os.path.abspath(os.path.join(branch_path, u'..', u'..',
     u'pyinstaller', u'pyinstaller.py'))
 openlp_main_script = os.path.abspath(os.path.join(branch_path, 'openlp.pyw'))
-lrelease_exe = os.path.join(site_packages, u'PyQt4', u'bin', u'lrelease.exe')
+if os.path.exists(os.path.join(site_packages, u'PyQt4', u'bin')):
+    # Older versions of the PyQt4 Windows installer put their binaries in the
+    # "bin" directory
+    lrelease_exe = os.path.join(site_packages, u'PyQt4', u'bin', u'lrelease.exe')
+else:
+    # Newer versions of the PyQt4 Windows installer put their binaries in the
+    # base directory of the installation
+    lrelease_exe = os.path.join(site_packages, u'PyQt4', u'lrelease.exe')
 i18n_utils = os.path.join(script_path, u'translation_utils.py')
 win32_icon = os.path.join(branch_path, u'resources', u'images', 'OpenLP.ico')
 
@@ -145,7 +152,7 @@
 i18n_path = os.path.join(branch_path, u'resources', u'i18n')
 winres_path = os.path.join(branch_path, u'resources', u'windows')
 build_path = os.path.join(branch_path, u'build')
-dist_path = os.path.join(build_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',
     u'lib', u'pptviewlib')
 
@@ -172,7 +179,7 @@
     pyinstaller = Popen((python_exe, pyi_build,
         u'--noconfirm',
         u'--windowed',
-        u'-o', build_path,
+        u'-o', branch_path,
         u'-i', win32_icon,
         u'-p', branch_path,
         u'-n', 'OpenLP',
@@ -319,17 +326,19 @@
     import sys
     for arg in sys.argv:
         if arg == u'-v' or arg == u'--verbose':
-            print "Script path:", script_path
-            print "Branch path:", branch_path
-            print "Source path:", source_path
-            print "\"dist\" path:", dist_path
-            print "PyInstaller:", pyi_build
+            print "OpenLP main script: ......", openlp_main_script
+            print "Script path: .............", script_path
+            print "Branch path: .............", branch_path
+            print "Source path: .............", source_path
+            print "\"dist\" path: .............", dist_path
+            print "PyInstaller: .............", pyi_build
             print "Documentation branch path:", doc_branch_path
-            print "Help file build path;", helpfile_path
-            print "Inno Setup path:", innosetup_exe
-            print "Windows resources:", winres_path
-            print "VCBuild path:", vcbuild_exe
-            print "PPTVIEWLIB path:", pptviewlib_path
+            print "Help file build path: ....", helpfile_path
+            print "Inno Setup path: .........", innosetup_exe
+            print "Windows resources: .......", winres_path
+            print "VCBuild path: ............", vcbuild_exe
+            print "PPTVIEWLIB path: .........", pptviewlib_path
+            print ""
         elif arg == u'--skip-update':
             skip_update = True
         elif arg == u'/?' or arg == u'-h' or arg == u'--help':