osxdist.py: create a tarball in addition to the XIP archive for OS X static Murmur.

1 files changed, 19 insertions, 5 deletions

diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
index 1d144edaa..e3f4612a1 100755
--- a/macx/scripts/osxdist.py
+++ b/macx/scripts/osxdist.py
@@ -322,8 +322,7 @@ def package_server():
 	else:
 		ver = gitrev()
 
-	name = 'Murmur-Static-%s' % ver
-	fn = name + '.xip'
+	name = 'Murmur-OSX-Static-%s' % ver
 
 	# Fix .ini files
 	os.system('cd scripts && sh mkini.sh')
@@ -347,10 +346,25 @@ def package_server():
 	codesign(os.path.join(destdir, 'murmurd'))
 
 	certname = 'Developer ID Installer: %s' % options.developer_id
-	p = Popen(('xip', '--keychain', options.keychain, '-s', certname, '--timestamp', destdir, os.path.join('release', fn)))
+	p = Popen(('xip', '--keychain', options.keychain, '-s', certname, '--timestamp', destdir, os.path.join('release', name+'.xip')))
 	retval = p.wait()
 	if retval != 0:
-		print 'Failed to build Murmur package'
+		print 'Failed to build Murmur XIP package'
+		sys.exit(1)
+
+	absrelease = os.path.join(os.getcwd(), 'release')
+
+	p = Popen(('tar', '-cjpf', name+'.tar.bz2', name), cwd=absrelease)
+	retval = p.wait()
+	if retval != 0:
+		print 'Failed to build Murmur tar.bz2 package'
+		sys.exit(1)
+
+	p = Popen(('gpg', '--detach-sign', '--armor', '-u', options.developer_id, '-o', name+'.tar.bz2.sig', name+'.tar.bz2'), cwd=absrelease)
+	retval = p.wait()
+	if retval != 0:
+		print 'Failed to sign Murmur tar.bz2 package'
+		sys.exit(1)
 
 if __name__ == '__main__':
 	parser = OptionParser()
@@ -358,7 +372,7 @@ if __name__ == '__main__':
 	parser.add_option('', '--universal', dest='universal', help='Build an universal snapshot.', action='store_true', default=False)
 	parser.add_option('', '--only-appbundle', dest='only_appbundle', help='Only prepare the appbundle. Do not package.', action='store_true', default=False)
 	parser.add_option('', '--only-overlay', dest='only_overlay', help='Only create the overlay installer.', action='store_true', default=False)
-	parser.add_option('', '--developer-id', dest='developer_id', help='Identity (Developer ID) to use for code signing. (If not set, no code signing will occur)')
+	parser.add_option('', '--developer-id', dest='developer_id', help='Identity (Developer ID) to use for code signing. The name is also used for GPG signing. (If not set, no code signing will occur)')
 	parser.add_option('', '--keychain', dest='keychain', help='The keychain to use when invoking code signing utilities. (Defaults to login.keychain', default='login.keychain')
 	parser.add_option('', '--server', dest='server', help='Build a Murmur package.', action='store_true', default=False)