diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2010-07-16 23:43:40 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2010-07-16 23:44:12 +0400 |
| commit | 932fe136d7f897e249c38648df3b9bbc4992fd8d (patch) | |
| tree | 138906d600eeab0eda3f04d69a5eb7cf25937152 /macx | |
| parent | c4eefe74c659ed892ae089d6ae40fc6389bc60a3 (diff) | |
Fix logic error in osxdist.py. Also make copied libraries explicitly owner-writable (OpenSSL wasn't).
Diffstat (limited to 'macx')
| -rwxr-xr-x | macx/scripts/osxdist.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py index 6811f2c51..66d39833a 100755 --- a/macx/scripts/osxdist.py +++ b/macx/scripts/osxdist.py @@ -97,12 +97,12 @@ class AppBundle(object): libs = Popen(['otool', '-L', path], stdout=PIPE).communicate()[0] libs = string.split(libs, '\n') ret = [] + bn = os.path.basename(path) for line in libs: g = m.match(line) if g is not None: lib = g.groups()[0] - bn = os.path.basename(path) - if not bn in lib: + if lib != bn: ret.append(lib) return ret @@ -140,7 +140,6 @@ class AppBundle(object): ''' Fix up dylib depends for a specific binary. ''' - # Does our fwpath exist already? If not, create it. if not self.framework_path: self.framework_path = self.bundle + '/Contents/Frameworks' @@ -184,9 +183,11 @@ class AppBundle(object): os.remove(dst + '/' + name + '_debug.prl') shutil.rmtree(dst + '/Versions/4/Headers') os.remove(dst + '/Versions/4/' + name + '_debug') + os.chmod(abs, 0755) os.system('install_name_tool -id @executable_path/../Frameworks/%s %s' % (rel, abs)) self.handled_libs[basename] = True self.handle_binary_libs(abs) + os.chmod(macho, 0755) os.system('install_name_tool -change %s @executable_path/../Frameworks/%s %s' % (lib, rel, macho)) # Regular dylibs @@ -197,9 +198,11 @@ class AppBundle(object): if not basename in self.handled_libs: shutil.copy(lib, self.framework_path + '/' + basename) abs = self.framework_path + '/' + rel + os.chmod(abs, 0755) os.system('install_name_tool -id @executable_path/../Frameworks/%s %s' % (rel, abs)) self.handled_libs[basename] = True self.handle_binary_libs(abs) + os.chmod(macho, 0755) os.system('install_name_tool -change %s @executable_path/../Frameworks/%s %s' % (lib, rel, macho)) def copy_murmur(self): |