Revert 64-bit version of macdeploy.

This commit is contained in:
John Maguire 2010-08-18 16:12:16 +00:00
parent ccc3f85316
commit dc819269be
1 changed files with 6 additions and 10 deletions

16
dist/macdeploy.py vendored
View File

@ -26,7 +26,7 @@ FRAMEWORK_SEARCH_PATH=[
os.path.join(os.environ['HOME'], 'Library/Frameworks')
]
LIBRARY_SEARCH_PATH=['/usr/local/lib', '/sw/lib', '/usr/local/lib64']
LIBRARY_SEARCH_PATH=['/usr/local/lib', '/sw/lib']
XINE_PLUGINS = [
'xineplug_ao_out_coreaudio.so',
@ -64,14 +64,13 @@ GSTREAMER_PLUGINS=[
'libgstdecodebin2.so',
'libgstequalizer.so',
'libgstosxaudio.so',
'libgstspectrum.so',
'libgsttypefindfunctions.so',
'libgstudp.so',
'libgstvolume.so',
# Codecs
'libgstapetag.so',
#'libgstasf.so',
'libgstasf.so',
'libgstfaac.so',
'libgstfaad.so',
'libgstffmpeg.so',
@ -84,7 +83,7 @@ GSTREAMER_PLUGINS=[
'libgstmusepack.so',
'libgstogg.so',
'libgstqtdemux.so',
#'libgstqtwrapper.so',
'libgstqtwrapper.so',
'libgstreplaygain.so',
'libgstspeex.so',
'libgstvorbis.so',
@ -110,7 +109,6 @@ QT_PLUGINS = [
'codecs/libqjpcodecs.dylib',
'codecs/libqkrcodecs.dylib',
'codecs/libqtwcodecs.dylib',
'graphicssystems/libqglgraphicssystem.dylib',
'iconengines/libqsvgicon.dylib',
'imageformats/libqgif.dylib',
'imageformats/libqico.dylib',
@ -271,7 +269,7 @@ def FixBinary(path):
def CopyLibrary(path):
new_path = os.path.join(frameworks_dir, os.path.basename(path))
args = ['ditto', '--arch=x86_64', path, new_path]
args = ['ditto', '--arch=i386', path, new_path]
commands.append(args)
return new_path
@ -279,7 +277,7 @@ def CopyPlugin(path, subdir):
new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
args = ['mkdir', '-p', os.path.dirname(new_path)]
commands.append(args)
args = ['ditto', '--arch=x86_64', path, new_path]
args = ['ditto', '--arch=i386', path, new_path]
commands.append(args)
return new_path
@ -291,7 +289,7 @@ def CopyFramework(path):
break
args = ['mkdir', '-p', full_path]
commands.append(args)
args = ['ditto', '--arch=x86_64', path, full_path]
args = ['ditto', '--arch=i386', path, full_path]
commands.append(args)
return os.path.join(full_path, parts[-1])
@ -312,8 +310,6 @@ def FixInstallPath(library_path, library, new_path):
commands.append(args)
def FindSystemLibrary(library_name):
if library_name == 'libiconv.2.dylib':
return None
for path in ['/lib', '/usr/lib']:
full_path = os.path.join(path, library_name)
if os.path.exists(full_path):