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

Merge remote-tracking branch 'origin/master' into spotifyplaylists

Browse Source 
Conflicts:
	admin/mac/macdeploy.py
This commit is contained in:
Leo Franchi
2012-03-26 12:26:09 -04:00
parent 1bd7d37a0a f41872540d
commit cb484a2058
14 changed files with 214 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin/mac/macdeploy.py
View File

@@ -1,4 +1,5 @@
#!/usr/bin/python
<<<<<<< HEAD
# This file is part of Tomahawk.
# It was inspired in large part by the macdeploy script in Clementine.
#
@@ -249,7 +250,7 @@ frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
commands.append(['mkdir', '-p', frameworks_dir])
resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
commands.append(['mkdir', '-p', resources_dir])
plugins_dir = os.path.join(bundle_dir, 'Contents', 'plugins')
plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
fixed_libraries = []