mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

* Try to fix VLC plugin deployment.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-07-22 19:56:00 +02:00
parent 56a28fa99f
commit 82d608b17b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/mac/macdeploy.py
View File

@@ -261,6 +261,8 @@ commands = []
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')
commands.append(['mkdir', '-p', frameworks_dir]) commands.append(['mkdir', '-p', frameworks_dir])
vlcplugins_dir = os.path.join(frameworks_dir, 'vlc', 'plugins')
commands.append(['mkdir', '-p', vlcplugins_dir])
resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources') resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
commands.append(['mkdir', '-p', resources_dir]) commands.append(['mkdir', '-p', resources_dir])
plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins') plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
@@ -372,12 +374,12 @@ def FixLibrary(path):
for library in broken_libs['libs']: for library in broken_libs['libs']:
FixLibraryInstallPath(library, new_path) FixLibraryInstallPath(library, new_path)
def FixVLCPlugin(abs_path, subdir): def FixVLCPlugin(abs_path):
broken_libs = GetBrokenLibraries(abs_path) broken_libs = GetBrokenLibraries(abs_path)
FixAllLibraries(broken_libs) FixAllLibraries(broken_libs)
#print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:])) #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
new_path = os.path.join(plugins_dir, subdir, os.path.basename(abs_path)) new_path = os.path.join(vlcplugins_dir, os.path.basename(abs_path))
args = ['mkdir', '-p', os.path.dirname(new_path)] args = ['mkdir', '-p', os.path.dirname(new_path)]
commands.append(args) commands.append(args)
args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path] args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path]
@@ -503,7 +505,7 @@ def FindVLCPlugin(name):
FixBinary(binary) FixBinary(binary)
for plugin in VLC_PLUGINS: for plugin in VLC_PLUGINS:
FixVLCPlugin(FindVLCPlugin(plugin), '../plugins') FixVLCPlugin(FindVLCPlugin(plugin))
for plugin in TOMAHAWK_PLUGINS: for plugin in TOMAHAWK_PLUGINS:
FixPlugin(plugin, '../MacOS') FixPlugin(plugin, '../MacOS')