TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Let's not include any system frameworks on OSX

Browse Source
This commit is contained in:
rdb 2011-10-29 09:30:44 +00:00
parent ba98ca742a
commit ff02ee1bab
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
direct/src/p3d/Packager.py
View File

@ -1082,8 +1082,12 @@ class Packager:
# Alter the dependencies to have a relative path rather than absolute # Alter the dependencies to have a relative path rather than absolute
for filename in framework_deps: for filename in framework_deps:
if self.__locateFrameworkLibrary(filename) == file.filename: loc = self.__locateFrameworkLibrary(filename)
if loc == file.filename:
os.system('install_name_tool -id "%s" "%s"' % (os.path.basename(filename), file.filename.toOsSpecific())) os.system('install_name_tool -id "%s" "%s"' % (os.path.basename(filename), file.filename.toOsSpecific()))
elif loc.toOsSpecific().startswith("/System/"):
# Let's keep references to system frameworks absolute
os.system('install_name_tool -change "%s" "%s" "%s"' % (filename, loc.toOsSpecific(), file.filename.toOsSpecific()))
else: else:
os.system('install_name_tool -change "%s" "%s" "%s"' % (filename, os.path.basename(filename), file.filename.toOsSpecific())) os.system('install_name_tool -change "%s" "%s" "%s"' % (filename, os.path.basename(filename), file.filename.toOsSpecific()))
@ -1147,6 +1151,10 @@ class Packager:
# aren't commonly on the library path either. # aren't commonly on the library path either.
filename = self.__locateFrameworkLibrary(filename) filename = self.__locateFrameworkLibrary(filename)
filename.setBinary() filename.setBinary()
# Let's skip system frameworks
if filename.toOsSpecific().startswith("/System/"):
continue
else: else:
# It's just a normal library - find it on the path. # It's just a normal library - find it on the path.
filename = Filename.fromOsSpecific(filename) filename = Filename.fromOsSpecific(filename)
@ -2333,7 +2341,6 @@ class Packager:
'libsystem.b.dylib', 'libmathcommon.a.dylib', 'libmx.a.dylib', 'libsystem.b.dylib', 'libmathcommon.a.dylib', 'libmx.a.dylib',
'libstdc++.6.dylib', 'libobjc.a.dylib', 'libauto.dylib', 'libstdc++.6.dylib', 'libobjc.a.dylib', 'libauto.dylib',
'tcl', 'tk',
] ]
# As above, but with filename globbing to catch a range of # As above, but with filename globbing to catch a range of