mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 16:14:40 +02:00
Code Issues Releases Wiki Activity

Fix framework structure in macdeploy.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2015-01-26 05:27:42 +01:00
parent 3ed1275f0d
commit 629c6f4795
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
admin/mac/macdeploy.py
View File

@@ -20,6 +20,7 @@ import re
import subprocess import subprocess
import commands import commands
import sys import sys
import glob
FRAMEWORK_SEARCH_PATH=[ FRAMEWORK_SEARCH_PATH=[
'/Library/Frameworks', '/Library/Frameworks',
@@ -270,6 +271,7 @@ bundle_dir = sys.argv[1]
bundle_name = os.path.basename(bundle_dir).split('.')[0] bundle_name = os.path.basename(bundle_dir).split('.')[0]
commands = [] commands = []
framework_paths = []
binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS') binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks') frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
@@ -447,7 +449,14 @@ def CopyFramework(path):
for i, part in enumerate(parts): for i, part in enumerate(parts):
if re.match(r'\w+\.framework', part): if re.match(r'\w+\.framework', part):
full_path = os.path.join(frameworks_dir, *parts[i:-1]) full_path = os.path.join(frameworks_dir, *parts[i:-1])
framework_name = part.split(".framework")[0]
break break
if full_path in framework_paths:
return os.path.join(full_path, parts[-1])
framework_paths.append(full_path)
args = ['mkdir', '-p', full_path] args = ['mkdir', '-p', full_path]
commands.append(args) commands.append(args)
args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path] args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path]
@@ -460,12 +469,30 @@ def CopyFramework(path):
args = ['cp', '-rf', menu_nib, resources_dir] args = ['cp', '-rf', menu_nib, resources_dir]
commands.append(args) commands.append(args)
# Fix framework structure for signing
path_base_dir = os.path.join(os.path.split(path)[0], '..', '..')
path_versions_dir = os.path.join(path_base_dir, 'Versions')
if not os.path.exists(os.path.join(full_path, 'Versions', 'Current')):
framework_base_dir = os.path.join(full_path, '..', '..')
framework_versions_dir = os.path.join(framework_base_dir, 'Versions')
versionParts = glob.glob(path_versions_dir+'/*')[0].split(os.sep)
args = ['ln', '-s', versionParts[-1], framework_versions_dir+'/Current']
commands.append(args)
args = ['ln', '-s', 'Versions/Current/'+framework_name, framework_base_dir+'/'+framework_name]
commands.append(args)
args = ['ln', '-s', 'Versions/Current/Resources', framework_base_dir+'/Resources']
commands.append(args)
# Copy Contents/Info.plist to Resources/Info.plist if Resources/Info.plist does not exist # Copy Contents/Info.plist to Resources/Info.plist if Resources/Info.plist does not exist
# If Contents/Info.plist doesn't exist either, error out. If we actually see this, we can copy QtCore's Info.plist # If Contents/Info.plist doesn't exist either, error out. If we actually see this, we can copy QtCore's Info.plist
info_plist_in_resources = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist') info_plist_in_resources = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
if os.path.exists(info_plist_in_resources): if os.path.exists(info_plist_in_resources):
info_plist_in_contents = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist') info_plist_in_contents = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
framework_resources_dir = os.path.join(full_path, '..', '..', 'Resources') framework_resources_dir = os.path.join(framework_versions_dir, versionParts[-1], 'Resources')
args = ['mkdir', '-p', framework_resources_dir] args = ['mkdir', '-p', framework_resources_dir]
commands.append(args) commands.append(args)
if os.path.exists(info_plist_in_contents): if os.path.exists(info_plist_in_contents):