Move OSX dist scripts to macx directory.

4 files changed, 508 insertions, 0 deletions

diff --git a/macx/macx.pro b/macx/macx.pro
index 37397f5cd..39836cf9b 100644
--- a/macx/macx.pro
+++ b/macx/macx.pro
@@ -2,3 +2,5 @@ TEMPLATE = subdirs
 
 CONFIG += debug_and_release
 SUBDIRS = overlay launcher compat osax
+
+include(scripts/scripts.pro)
diff --git a/macx/DS_Store b/macx/scripts/DS_Store
index 9baa5d1e6..9baa5d1e6 100644
--- a/macx/DS_Store
+++ b/macx/scripts/DS_Store
diff --git a/macx/gendmg.pl b/macx/scripts/gendmg.pl
index 475295d56..475295d56 100755
--- a/macx/gendmg.pl
+++ b/macx/scripts/gendmg.pl
diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
new file mode 100755
index 000000000..b7483f607
--- /dev/null
+++ b/macx/scripts/osxdist.py
@@ -0,0 +1,506 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Simple Mac OS X Application Bundler for Mumble
+#
+# Loosely based on original bash-version by Sebastian Schlingmann (based, again, on a OSX application bundler
+# by Thomas Keller).
+#
+
+import sys, os, string, re, shutil, plistlib, tempfile, exceptions, datetime
+from subprocess import Popen, PIPE
+from optparse import OptionParser
+
+def gitrev():
+	'''Get git revision of the current Mumble build.'''
+	return os.popen('git show HEAD | grep commit | sed \'s,commit\ ,,\' | head -c6').read()
+
+def codesign(id, path):
+	'''Call the codesign executable.'''
+
+	if type(path) == list or type(path) == tuple:
+		for p in path:
+			p = Popen(('codesign', '-vvvv', '-s', id, p))
+			retval = p.wait()
+			if retval != 0:
+				return retval
+	else:
+		p = Popen(('codesign', '-vvvv', '-s', id, path))
+		retval = p.wait()
+		if retval != 0:
+			return retval
+	return 0
+
+class AppBundle(object):
+
+	def is_system_lib(self, lib):
+		'''
+			Is the library a system library, meaning that we should not include it in our bundle?
+		'''
+		if lib.startswith('/System/Library/'):
+			return True
+		if lib.startswith('/usr/lib/'):
+			return True
+
+		return False
+
+	def is_dylib(self, lib):
+		'''
+			Is the library a dylib?
+		'''
+		return lib.endswith('.dylib')
+
+	def get_framework_base(self, fw):
+		'''
+			Extracts the base .framework bundle path from a library in an abitrary place in a framework.
+		'''
+		paths = fw.split('/')
+		for i, str in enumerate(paths):
+			if str.endswith('.framework'):
+				return '/'.join(paths[:i+1])
+		return None
+
+	def is_framework(self, lib):
+		'''
+			Is the library a framework?
+		'''
+		return bool(self.get_framework_base(lib))
+
+	def get_binary_libs(self, path):
+		'''
+			Get a list of libraries that we depend on.
+		'''
+		m = re.compile('^\t(.*)\ \(.*$')
+		libs = Popen(['otool', '-L', path], stdout=PIPE).communicate()[0]
+		libs = string.split(libs, '\n')
+		ret = []
+		for line in libs:
+			g = m.match(line)
+			if g is not None:
+				lib = g.groups()[0]
+				bn = os.path.basename(path)
+				if not bn in lib:
+					ret.append(lib)
+		return ret
+
+	def handle_libs(self):
+		'''
+			Copy non-system libraries that we depend on into our bundle, and fix linker
+			paths so they are relative to our bundle.
+		'''
+		print ' * Taking care of libraries'
+
+		# Does our fwpath exist?
+		fwpath = os.path.join(os.path.abspath(self.bundle), 'Contents', 'Frameworks')
+		if not os.path.exists(fwpath):
+			os.mkdir(fwpath)
+
+		self.handle_binary_libs()
+
+		murmurd = os.path.join(os.path.abspath(self.bundle), 'Contents', 'MacOS', 'murmurd')
+		if os.path.exists(murmurd):
+			self.handle_binary_libs(murmurd)
+
+		ol = os.path.join(os.path.abspath(self.bundle), 'Contents', 'MacOS', 'mumble-overlay')
+		if os.path.exists(ol):
+			self.handle_binary_libs(ol)
+
+		g15 = os.path.join(os.path.abspath(self.bundle), 'Contents', 'MacOS', 'mumble-g15-helper')
+		if os.path.exists(g15):
+			self.handle_binary_libs(g15)
+
+		manual = os.path.join(os.path.abspath(self.bundle), 'Contents', 'Plugins', 'libmanual.dylib')
+		if os.path.exists(manual):
+			self.handle_binary_libs(manual)
+
+	def handle_binary_libs(self, macho=None):
+		'''
+			Fix up dylib depends for a specific binary.
+		'''
+
+		# Does our fwpath exist already? If not, create it.
+		if not self.framework_path:
+			self.framework_path = self.bundle + '/Contents/Frameworks'
+			if not os.path.exists(self.framework_path):
+				os.mkdir(self.framework_path)
+			else:
+				shutil.rmtree(self.framework_path)
+				os.mkdir(self.framework_path)
+
+		# If we weren't explicitly told which binary to operate on, pick the
+		# bundle's default executable from its property list.
+		if macho is None:
+			macho = os.path.abspath(self.binary)
+		else:
+			macho = os.path.abspath(macho)
+
+		libs = self.get_binary_libs(macho)
+
+		for lib in libs:
+
+			# Skip system libraries
+			if self.is_system_lib(lib):
+				continue
+
+			# Frameworks are 'special'.
+			if self.is_framework(lib):
+				fw_path = self.get_framework_base(lib)
+				basename = os.path.basename(fw_path)
+				name = basename.split('.framework')[0]
+				rel = basename + '/' + name
+
+				abs = self.framework_path + '/' + rel
+
+				if not basename in self.handled_libs:
+					dst = self.framework_path + '/' + basename
+					shutil.copytree(fw_path, dst, symlinks=True)
+					if name.startswith('Qt'):
+						os.remove(dst + '/Headers')
+						os.remove(dst + '/' + name + '.prl')
+						os.remove(dst + '/' + name + '_debug')
+						os.remove(dst + '/' + name + '_debug.prl')
+						shutil.rmtree(dst + '/Versions/4/Headers')
+						os.remove(dst + '/Versions/4/' + name + '_debug')
+						os.system('install_name_tool -id @executable_path/../Frameworks/%s %s' % (rel, abs))
+						self.handled_libs[basename] = True
+						self.handle_binary_libs(abs)
+				os.system('install_name_tool -change %s @executable_path/../Frameworks/%s %s' % (lib, rel, macho))
+
+			# Regular dylibs
+			else:
+				basename = os.path.basename(lib)
+				rel = basename
+
+				if not basename in self.handled_libs:
+					shutil.copy(lib, self.framework_path  + '/' + basename)
+					abs = self.framework_path + '/' + rel
+					os.system('install_name_tool -id @executable_path/../Frameworks/%s %s' % (rel, abs))
+					self.handled_libs[basename] = True
+					self.handle_binary_libs(abs)
+				os.system('install_name_tool -change %s @executable_path/../Frameworks/%s %s' % (lib, rel, macho))
+
+	def copy_murmur(self):
+		'''
+			Copy the murmurd binary into our Mumble app bundle
+		'''
+		print ' * Copying murmurd binary'
+		src = os.path.join(self.bundle, '..', 'murmurd')
+		dst = os.path.join(self.bundle, 'Contents', 'MacOS', 'murmurd')
+		shutil.copy(src, dst)
+
+		print ' * Copying murmurd configuration'
+		dst = os.path.join(self.bundle, 'Contents', 'MacOS', 'murmur.ini')
+		shutil.copy('scripts/murmur.ini.osx', dst)
+
+	def copy_g15helper(self):
+		'''
+			Copy the Mumble G15 helper daemon into our Mumble app bundle.
+		'''
+		print ' * Copying G15 helper'
+		src = os.path.join(self.bundle, '..', 'mumble-g15-helper')
+		dst = os.path.join(self.bundle, 'Contents', 'MacOS', 'mumble-g15-helper')
+		shutil.copy(src, dst)
+
+	def copy_resources(self, rsrcs):
+		'''
+			Copy needed resources into our bundle.
+		'''
+		print ' * Copying needed resources'
+		rsrcpath = os.path.join(self.bundle, 'Contents', 'Resources')
+		if not os.path.exists(rsrcpath):
+			os.mkdir(rsrcpath)
+		for rsrc in rsrcs:
+			b = os.path.basename(rsrc)
+			if os.path.isdir(rsrc):
+	                        shutil.copytree(rsrc, os.path.join(rsrcpath, b), symlinks=True)
+			elif os.path.isfile(rsrc):
+				shutil.copy(rsrc, os.path.join(rsrcpath, b))
+
+	def copy_overlay(self):
+		'''
+			Copy overlay resources.
+		'''
+		print ' * Copying overlay resources into bundle.'
+
+		dst = os.path.join(self.bundle, 'Contents', 'Overlay')
+		os.makedirs(dst)
+		shutil.copy('release/libmumbleoverlay.dylib', dst)
+		shutil.copy('release/mumble-overlay', dst)
+
+	def copy_codecs(self):
+		'''
+			Copy over dynamic CELT libraries.
+		'''
+		print ' * Copying CELT libraries.'
+		dst = os.path.join(self.bundle, 'Contents', 'Codecs')
+		os.makedirs(dst)
+		shutil.copy('release/libcelt0.0.7.0.dylib', dst)
+
+	def copy_plugins(self):
+		'''
+			Copy over any built Mumble plugins.
+		'''
+		print ' * Copying positional audio plugins'
+		dst = os.path.join(self.bundle, 'Contents', 'Plugins')
+		if os.path.exists(dst):
+			shutil.rmtree(dst)
+		shutil.copytree('release/plugins/', dst, symlinks=True)
+
+	def copy_qt_plugins(self):
+		'''
+			Copy over any needed Qt plugins.
+		'''
+
+		print ' * Copying Qt and preparing plugins'
+
+		src = os.popen('qmake -query QT_INSTALL_PREFIX').read().strip() + '/plugins'
+		dst = os.path.join(self.bundle, 'Contents', 'QtPlugins')
+		shutil.copytree(src, dst, symlinks=False)
+
+		top = dst
+		files = {}
+
+		def cb(arg, dirname, fnames):
+			if dirname == top:
+				return
+			files[os.path.basename(dirname)] = fnames
+
+		os.path.walk(top, cb, None)
+
+		exclude = ( 'phonon_backend', 'designer', 'script' )
+
+		for dir, files in files.items():
+			absdir = dst + '/' + dir
+			if dir in exclude:
+				shutil.rmtree(absdir)
+				continue
+			for file in files:
+				abs = absdir + '/' + file
+				if file.endswith('_debug.dylib'):
+					os.remove(abs)
+				else:
+					os.system('install_name_tool -id %s %s' % (file, abs))
+					self.handle_binary_libs(abs)
+
+	def update_plist(self):
+		'''
+			Modify our bundle's Info.plist to make it ready for release.
+		'''
+		if self.version is not None:
+			print ' * Changing version in Info.plist'
+			p = self.infoplist
+			p['CFBundleVersion'] = self.version
+			plistlib.writePlist(p, self.infopath)
+
+	def done(self):
+		print ' * Done!'
+		print ''
+
+	def __init__(self, bundle, version=None):
+		self.framework_path = ''
+		self.handled_libs = {}
+		self.bundle = bundle
+		self.version = version
+		self.infopath = os.path.join(os.path.abspath(bundle), 'Contents', 'Info.plist')
+		self.infoplist = plistlib.readPlist(self.infopath)
+		self.binary = os.path.join(os.path.abspath(bundle), 'Contents', 'MacOS', self.infoplist['CFBundleExecutable'])
+		print ' * Preparing AppBundle'
+
+
+class FolderObject(object):
+
+	class Exception(exceptions.Exception):
+		pass
+
+	def __init__(self):
+		self.tmp = tempfile.mkdtemp()
+
+	def copy(self, src, dst='/'):
+		'''
+			Copy a file or directory into the folder.
+		'''
+		asrc = os.path.abspath(src)
+
+		if dst[0] != '/':
+			raise self.Exception
+
+		# Determine destination
+		if dst[-1] == '/':
+			adst = os.path.abspath(self.tmp + '/' + dst + os.path.basename(src))
+		else:
+			adst = os.path.abspath(self.tmp + '/' + dst)
+
+		if os.path.isdir(asrc):
+			print ' * Copying directory: %s' % os.path.basename(asrc)
+			shutil.copytree(asrc, adst, symlinks=True)
+		elif os.path.isfile(asrc):
+			print ' * Copying file: %s' % os.path.basename(asrc)
+			shutil.copy(asrc, adst)
+
+	def symlink(self, src, dst):
+		'''
+			Create a symlink inside the folder.
+		'''
+		asrc = os.path.abspath(src)
+		adst = self.tmp + '/' + dst
+		print ' * Creating symlink %s' % os.path.basename(asrc)
+		os.symlink(asrc, adst)
+
+	def mkdir(self, name):
+		'''
+			Create a directory inside the folder.
+		'''
+		print ' * Creating directory %s' % os.path.basename(name)
+		adst = self.tmp + '/'  + name
+		os.makedirs(adst)
+
+
+class DiskImage(FolderObject):
+
+	def __init__(self, filename, volname):
+		FolderObject.__init__(self)
+		print ' * Preparing to create diskimage'
+		self.filename = filename
+		self.volname = volname
+
+	def create(self):
+		'''
+			Create the disk image itself.
+		'''
+		print ' * Creating diskimage. Please wait...'
+		if os.path.exists(self.filename):
+			shutil.rmtree(self.filename)
+		p = Popen(['hdiutil', 'create',
+		           '-srcfolder', self.tmp,
+		           '-format', 'UDBZ',
+		           '-volname', self.volname,
+		           self.filename])
+		retval = p.wait()
+		print ' * Removing temporary directory.'
+		shutil.rmtree(self.tmp)
+		print ' * Done!'
+
+
+if __name__ == '__main__':
+
+	parser = OptionParser()
+	parser.add_option('', '--release', dest='release', help='Build a release. This determines the version number of the release.')
+	parser.add_option('', '--snapshot', dest='snapshot', help='Build a snapshot release. This determines the \'snapshot version\'.')
+	parser.add_option('', '--git', dest='git', help='Build a snapshot release. Use the git revision number as the \'snapshot version\'.', 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('', '--codesign', dest='codesign', help='Create a codesigned build.')
+
+	options, args = parser.parse_args()
+
+	# Release
+	if options.release:
+		ver = options.release
+		fn = 'release/Mumble-%s.dmg' % ver
+		title = 'Mumble %s' % ver
+	# Snapshot
+	elif options.snapshot or options.git:
+		n = datetime.datetime.now()
+		d = n.strftime('%F-%H%M')
+		if not options.git:
+			ver = options.snapshot
+		else:
+			ver = gitrev()	
+		fn = 'release/Mumble-Snapshot-%s-%s.dmg' % (d, ver)
+		title = 'Mumble Snapshot %s (%s)' % (ver, d)		
+	else:
+		print 'Neither snapshot or release selected. Bailing.'
+		sys.exit(1)
+
+	if not os.path.exists('release'):
+		print 'This script needs to be run from the root of the Mumble source tree.'
+		sys.exit(1)
+
+	# Fix .ini files
+	os.system('cd scripts && sh mkini.sh')
+
+	# Do the finishing touches to our Application bundle before release
+	a = AppBundle('release/Mumble.app', ver)
+	a.copy_murmur()
+	a.copy_g15helper()
+	a.copy_overlay()
+	a.copy_codecs()
+	a.copy_plugins()
+	a.copy_qt_plugins()
+	a.handle_libs()
+	a.copy_resources(['icons/mumble.icns', 'scripts/qt.conf'])
+	a.update_plist()
+	a.done()
+
+	# Fix Mumble11x
+	c = AppBundle('release/Mumble11x.app', ver)
+	c.copy_g15helper()
+	c.copy_overlay()
+	c.copy_plugins()
+	c.copy_qt_plugins()
+	c.handle_libs()
+	c.copy_resources(['icons/mumble.icns', 'scripts/qt.conf'])
+	c.update_plist()
+	c.done()
+
+	# Sign our binaries, etc.
+	if options.codesign:
+		print ' * Signing binaries with identity `%s\'' % options.codesign
+		binaries = (
+			# 1.2.x
+			'release/Mumble.app',
+			'release/Mumble.app/Contents/MacOS/murmurd',
+			'release/Mumble.app/Contents/MacOS/mumble-g15-helper',
+			'release/Mumble.app/Contents/Overlay/mumble-overlay',
+			'release/Mumble.app/Contents/Plugins/liblink.dylib',
+			'release/Mumble.app/Contents/Plugins/libmanual.dylib',
+			'release/Mumble.app/Contents/Overlay/libmumbleoverlay.dylib',
+			'release/Mumble.app/Contents/Codecs/libcelt0.0.7.0.dylib',
+			# 1.1.x
+			'release/Mumble11x.app/',
+			'release/Mumble11x.app/Contents/MacOS/mumble-g15-helper',
+			'release/Mumble11x.app/Contents/Plugins/liblink.dylib',
+			'release/Mumble11x.app/Contents/Plugins/libmanual.dylib',
+		)
+
+		codesign(options.codesign, binaries)
+		print ''
+
+	if options.only_appbundle:
+		sys.exit(0)
+
+	# Create diskimage
+	d = DiskImage(fn, title)
+	d.copy('macx/scripts/DS_Store', '/.DS_Store')
+	d.mkdir('.background')
+	d.copy('icons/mumble.osx.installer.png', '/.background/background.png')
+	d.symlink('/Applications', '/Applications')
+	d.copy('release/Mumble.app')
+	d.copy('release/Mumble11x.app')
+	d.copy('README', '/ReadMe.txt')
+	d.copy('CHANGES', '/Changes.txt')
+	d.mkdir('Licenses')
+	d.copy('LICENSE', '/Licenses/Mumble.txt')
+	d.copy('installer/lgpl.txt', '/Licenses/Qt.txt')
+	d.copy('installer/speex.txt', '/Licenses/Speex.txt')
+	d.copy('installer/portaudio.txt', '/Licenses/PortAudio.txt')
+	d.copy('installer/gpl.txt', '/Licenses/ZeroC-Ice.txt')
+	d.mkdir('Murmur Extras')
+	d.copy('scripts/murmur.ini.osx', '/Murmur Extras/murmur.ini')
+	d.copy('scripts/murmur.conf', '/Murmur Extras/')
+	d.copy('scripts/dbusauth.pl', '/Murmur Extras/')
+	d.copy('scripts/murmur.pl', '/Murmur Extras/')
+	d.copy('scripts/weblist.pl', '/Murmur Extras/')
+	d.copy('scripts/weblist.php', '/Murmur Extras/')
+	d.copy('scripts/icedemo.php', '/Murmur Extras/')
+	d.copy('scripts/ListUsers.cs', '/Murmur Extras/')
+	d.copy('scripts/mumble-auth.py', '/Murmur Extras/')
+	d.copy('scripts/rubytest.rb', '/Murmur Extras')
+	d.copy('scripts/simpleregister.php', '/Murmur Extras/')
+	d.copy('scripts/testcallback.py', '/Murmur Extras/')
+	d.copy('scripts/testauth.py', '/Murmur Extras/')
+	d.copy('scripts/addban.php', '/Murmur Extras/')
+	d.copy('scripts/php.ini', '/Murmur Extras/')
+	d.copy('src/murmur/Murmur.ice', '/Murmur Extras/')
+	d.copy('scripts/phpBB3auth.ini', '/Murmur Extras/')
+	d.copy('scripts/phpBB3auth.py', '/Murmur Extras/')
+	d.create()