openlp-core team mailing list archive

[matysek <mzibricky@xxxxxxxxx>]

matysek has proposed merging lp:~mzibricky/openlp/packaging into lp:openlp/packaging.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #779201 in OpenLP: "QString and QVariant auto-conversion"
  https://bugs.launchpad.net/openlp/+bug/779201
  Bug #814838 in OpenLP: "cleanup Mac OS X build script"
  https://bugs.launchpad.net/openlp/+bug/814838

For more details, see:
https://code.launchpad.net/~mzibricky/openlp/packaging/+merge/146302

Reflect renaming of openlp.pyw -> openlp.py in windows/osx build scripts.
-- 
https://code.launchpad.net/~mzibricky/openlp/packaging/+merge/146302
Your team OpenLP Core is requested to review the proposed merge of lp:~mzibricky/openlp/packaging into lp:openlp/packaging.

=== modified file 'osx/macosx-builder.py'
--- osx/macosx-builder.py	2013-01-01 01:04:23 +0000
+++ osx/macosx-builder.py	2013-02-03 14:59:20 +0000
@@ -280,7 +280,7 @@
             self.docs_path = self.config.get(u'paths', u'documentation')
 
         self.openlp_script = os.path.abspath(
-            os.path.join(self.branch_path, u'openlp.pyw'))
+            os.path.join(self.branch_path, u'openlp.py'))
         self.hooks_path = os.path.abspath(os.path.join(
             self.branch_path, self.config.get(u'paths', u'hooks')))
         self.mac_icon = os.path.abspath(

=== modified file 'windows/windows-builder.py'
--- windows/windows-builder.py	2013-01-20 23:10:49 +0000
+++ windows/windows-builder.py	2013-02-03 14:59:20 +0000
@@ -270,7 +270,7 @@
         else:
             self.portable_path = u''
         self.openlp_script = os.path.abspath(
-            os.path.join(branch_path, u'openlp.pyw'))
+            os.path.join(branch_path, u'openlp.py'))
         self.hooks_path = os.path.abspath(self.config.get(u'paths', u'hooks'))
         self.win32_icon = os.path.abspath(
             self.config.get(u'paths', u'win32icon'))