summaryrefslogtreecommitdiff
path: root/distribution/lib/DistUtils.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-01-21 15:41:46 +0100
committerJose <jose@zeroc.com>2013-01-21 15:41:46 +0100
commit6a788321deaf163d6ed1e5536034aa2d590fdbf6 (patch)
treec0c40a1804e8e63c62bb2794bdc0086ddf0bda40 /distribution/lib/DistUtils.py
parentUpdated EJB test (diff)
downloadice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.tar.bz2
ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.tar.xz
ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.zip
Undo OS X Frameworks updates
Diffstat (limited to 'distribution/lib/DistUtils.py')
-rw-r--r--distribution/lib/DistUtils.py17
1 files changed, 2 insertions, 15 deletions
diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py
index a652fb30666..49aeba1118a 100644
--- a/distribution/lib/DistUtils.py
+++ b/distribution/lib/DistUtils.py
@@ -705,7 +705,7 @@ class Platform:
def copyThirdPartyDependencies(self, buildDir):
for t in filter(ThirdParty.includeInDistribution, self.thirdParties): t.copyToDistribution(self, buildDir)
- def completeDistribution(self, buildDir, frameworksDir, version):
+ def completeDistribution(self, buildDir, version):
pass
def getPackageName(self, prefix, version):
@@ -778,7 +778,7 @@ class Darwin(Platform):
def getMakeOptions(self):
return "-j 8"
- def completeDistribution(self, buildDir, frameworksDir, version):
+ def completeDistribution(self, buildDir, version):
print "Fixing install names...",
sys.stdout.flush()
@@ -817,19 +817,6 @@ class Darwin(Platform):
for f in binFiles:
os.system('install_name_tool -change ' + oldName + ' ' + newName + ' ' + f)
- #
- # Replace the names in frameworks binaries.
- #
- names = ["IceUtil", "Ice", "IceSSL", "Glacier2", "IcePatch2", "IceStorm", "IceGrid"]
- for name in names:
- f = frameworksDir + "/" + name + ".framework/" + name
- newName = "/Library/Frameworks/" + name + ".framework/Versions/" + mmversion + "/" + name
- os.system('install_name_tool -id ' + newName + ' ' + f)
- for component in names:
- oldPath = frameworksDir + "/" + component + ".framework/Versions/" + mmversion + "/" + component
- newPath = "/Library/Frameworks/" + component + ".framework/Versions/" + mmversion + "/" + component
- os.system('install_name_tool -change ' + oldPath + ' ' + newPath + ' ' + f)
-
print "ok"
print "Fixing python location"