Remove "compat", i386 is not supported anymore

"compat" was a very small and simple program; its purpose was to show a message informing the user that the Mumble binary is only for x86_64 processors.

The i386 architecture is not supported in Xcode 10, meaning that we cannot compile it anymore.

https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes

1 files changed, 0 insertions, 14 deletions

diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
index 3f225ab78..ed4c1787d 100755
--- a/macx/scripts/osxdist.py
+++ b/macx/scripts/osxdist.py
@@ -159,17 +159,6 @@ class AppBundle(object):
 			p['CFBundleVersion'] = self.version
 			plistlib.writePlist(p, self.infopath)
 
-	def add_compat_warning(self):
-		'''
-			Add compat binary for when our binary is run on i386 or ppc.
-			The compat binary displays a warning dialog telling the user that they need to download a universal version of Mumble
-		'''
-		print ' * Splicing Mumble.compat into main bundle executable'
-		p = Popen(('lipo', '-create', 'release/Mumble.compat', '-arch', 'x86_64', self.binary, '-output', self.binary))
-		retval = p.wait()
-		if retval != 0:
-			raise Exception('build-overlay-installer failed')
-
 	def set_min_macosx_version(self, version):
 		'''
 			Set the minimum version of Mac OS X version that this App will run on.
@@ -296,8 +285,6 @@ def package_client():
 	a.copy_resources(['icons/mumble.icns'])
 	a.update_plist()
 	if not options.universal:
-		if options.compat_warning:
-			a.add_compat_warning()
 		a.set_min_macosx_version('10.9.0')
 	else:
 		a.set_min_macosx_version('10.4.8')
@@ -389,7 +376,6 @@ 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('', '--no-compat-warning', dest='compat_warning', help='No warning message when running the image on x86. This option should only be used when the warning application cannot be built as 32 bit (rendering it useless).', action='store_false', default=True)
 	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)