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 #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/124321

For osx release build bzr revision is not included in .version file.
-- 
https://code.launchpad.net/~mzibricky/openlp/packaging/+merge/124321
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	2012-06-27 13:13:20 +0000
+++ osx/macosx-builder.py	2012-09-13 23:12:18 +0000
@@ -377,7 +377,11 @@
         self.version_string = u'%s-bzr%s' % (tag, latest)
         self.version_tag = tag
         version_file = open(os.path.join(self.dist_path, u'.version'), u'w')
-        version_file.write(self.version_string)
+        # Release version does not contain revision in .dmg name.
+        if self.args.devel:
+            version_file.write(self.version_string)
+        else:
+            version_file.write(self.version_tag)
         version_file.close()
 
     def copy_plugins(self):