Skip to content

Commit

Permalink
MAINT: Port osxdist script to Python 3
Browse files Browse the repository at this point in the history 
The script used to package the Mumble DMG file on macOS was still using
Python 2.

The port to Python 3 is performed by this commit.
  • Loading branch information
@Krzmbrzl
Krzmbrzl committed May 8, 2022
1 parent 7394dc6 commit c4abb61
Showing 1 changed file with 34 additions and 33 deletions.
67 changes: 34 additions & 33 deletions macx/scripts/osxdist.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Copyright 2010-2022 The Mumble Developers. All rights reserved.
Expand All @@ -13,7 +13,7 @@
# by Thomas Keller).
#

import sys, os, string, re, shutil, plistlib, tempfile, exceptions, datetime, tarfile, glob
import sys, os, string, shutil, plistlib, tempfile, glob
from subprocess import Popen, PIPE
from optparse import OptionParser

Expand Down Expand Up @@ -41,7 +41,7 @@ def certificate_subject_OU(identity):

def lookup_file_identifier(path):
try:
d = plistlib.readPlist(os.path.join(path, 'Contents', 'Info.plist'))
d = plistlib.load(open(os.path.join(path, 'Contents', 'Info.plist'), "rb"))
return d['CFBundleIdentifier']
except:
return os.path.basename(path)
Expand Down Expand Up @@ -80,7 +80,7 @@ def prodsign(inf, outf):
return 0

def create_overlay_package():
print '* Creating overlay installer'
print('* Creating overlay installer')

bundle = os.path.join(options.binary_dir, 'MumbleOverlay.osax')
overlaylib = os.path.join(options.binary_dir, 'libmumbleoverlay.dylib')
Expand All @@ -105,7 +105,7 @@ def copy_helper(self, fn):
Copy a helper binary into the Mumble app bundle.
'''
if os.path.exists(os.path.join(self.bundle, '..', fn)):
print ' * Copying helper binary: %s' % fn
print(' * Copying helper binary: %s' % fn)
src = os.path.join(self.bundle, '..', fn)
dst = os.path.join(self.bundle, 'Contents', 'MacOS', fn)
shutil.copy(src, dst)
Expand All @@ -114,7 +114,7 @@ def copy_resources(self, rsrcs):
'''
Copy needed resources into our bundle.
'''
print ' * Copying needed resources'
print(' * Copying needed resources')
rsrcpath = os.path.join(self.bundle, 'Contents', 'Resources')
if not os.path.exists(rsrcpath):
os.mkdir(rsrcpath)
Expand All @@ -134,9 +134,9 @@ def copy_codecs(self):
'''
Try to copy the dynamic audio codec libraries into the App Bundle.
'''
print ' * Attempting to copy audio codec libraries into App Bundle'
print(' * Attempting to copy audio codec libraries into App Bundle')
dst = os.path.join(self.bundle, 'Contents', 'Codecs')
if not os.path.exists(dst):
if not os.path.exists(dst):
os.makedirs(dst)
codecs = (os.path.join(options.binary_dir, 'libcelt0.0.7.0.dylib'), os.path.join(options.binary_dir, 'libopus.dylib'))
for codec in codecs:
Expand All @@ -147,7 +147,7 @@ def copy_plugins(self):
'''
Copy over any built Mumble plugins.
'''
print ' * Copying positional audio plugins'
print(' * Copying (positional audio) plugins')
dst = os.path.join(self.bundle, 'Contents', 'Plugins')
if not os.path.exists(dst):
os.makedirs(dst)
Expand All @@ -159,37 +159,37 @@ 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'
print(' * Changing version in Info.plist')
p = self.infoplist
p['CFBundleVersion'] = self.version
plistlib.writePlist(p, self.infopath)
plistlib.dump(p, open(self.infopath, "wb"))

def set_min_macosx_version(self, version):
'''
Set the minimum version of Mac OS X version that this App will run on.
'''
print ' * Setting minimum Mac OS X version to: %s' % (version)
print(' * Setting minimum Mac OS X version to: %s' % (version))
self.infoplist['LSMinimumSystemVersion'] = version

def done(self):
plistlib.writePlist(self.infoplist, self.infopath)
print ' * Done!'
print ''
plistlib.dump(self.infoplist, open(self.infopath, "wb"))
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.infoplist = plistlib.load(open(self.infopath, "rb"))
self.binary = os.path.join(os.path.abspath(bundle), 'Contents', 'MacOS', self.infoplist['CFBundleExecutable'])
print ' * Preparing AppBundle'
print(' * Preparing AppBundle')


class FolderObject(object):

class Exception(exceptions.Exception):
class Exception(Exception):
pass

def __init__(self):
Expand All @@ -211,10 +211,10 @@ def copy(self, src, dst='/'):
adst = os.path.abspath(self.tmp + '/' + dst)

if os.path.isdir(asrc):
print ' * Copying directory: %s' % os.path.basename(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)
print(' * Copying file: %s' % os.path.basename(asrc))
shutil.copy(asrc, adst)

def symlink(self, src, dst):
Expand All @@ -223,14 +223,14 @@ def symlink(self, src, dst):
'''
asrc = os.path.abspath(src)
adst = self.tmp + '/' + dst
print ' * Creating symlink %s' % os.path.basename(asrc)
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)
print(' * Creating directory %s' % os.path.basename(name))
adst = self.tmp + '/' + name
os.makedirs(adst)

Expand All @@ -239,15 +239,15 @@ class DiskImage(FolderObject):

def __init__(self, filename, volname):
FolderObject.__init__(self)
print ' * Preparing to create diskimage'
print(' * Preparing to create diskimage')
self.filename = filename
self.volname = volname

def create(self):
'''
Create the disk image itself.
'''
print ' * Creating diskimage. Please wait...'
print(' * Creating diskimage. Please wait...')
if os.path.exists(self.filename):
os.remove(self.filename)
p = Popen(['hdiutil', 'create',
Expand All @@ -257,9 +257,10 @@ def create(self):
'-megabytes', '130',
self.filename])
retval = p.wait()
print ' * Removing temporary directory.'
assert retval == 0
print(' * Removing temporary directory.')
shutil.rmtree(self.tmp)
print ' * Done!'
print(' * Done!')

def package_client():
if options.version is not None:
Expand Down Expand Up @@ -293,7 +294,7 @@ def package_client():

# Sign our binaries, etc.
if options.developer_id:
print ' * Signing binaries with Developer ID `%s\'' % options.developer_id
print(' * Signing binaries with Developer ID `%s\'' % options.developer_id)
binaries = (
os.path.join(options.binary_dir, 'Mumble.app'),
os.path.join(options.binary_dir, 'Mumble.app/Contents/Plugins/liblink.dylib'),
Expand All @@ -304,7 +305,7 @@ def package_client():
)
availableBinaries = [bin for bin in binaries if os.path.exists(bin)]
codesign(availableBinaries)
print ''
print()

if options.only_appbundle:
sys.exit(0)
Expand Down Expand Up @@ -352,21 +353,21 @@ def package_server():
p = Popen(('xip', '--keychain', options.keychain, '-s', certname, '--timestamp', destdir, os.path.join(options.binary_dir, name+'.xip')))
retval = p.wait()
if retval != 0:
print 'Failed to build Murmur XIP package'
print('Failed to build Murmur XIP package')
sys.exit(1)

absrelease = os.path.join(os.getcwd(), 'options.binary_dir')

p = Popen(('tar', '-cjpf', name+'.tar.bz2', name), cwd=absrelease)
retval = p.wait()
if retval != 0:
print 'Failed to build Murmur tar.bz2 package'
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'
print('Failed to sign Murmur tar.bz2 package')
sys.exit(1)

if __name__ == '__main__':
Expand All @@ -384,11 +385,11 @@ def package_server():
options, args = parser.parse_args()

if not os.path.exists(options.source_dir):
print 'Please specify a source directory that exists!'
print('Please specify a source directory that exists!')
sys.exit(1)

if not os.path.exists(options.binary_dir):
print 'Please specify a binary directory that exists!'
print('Please specify a binary directory that exists!')
sys.exit(1)

if not options.server:
Expand Down

0 comments on commit c4abb61

Please sign in to comment.