diff options
| author | Jose <jose@zeroc.com> | 2013-01-21 15:41:46 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-21 15:41:46 +0100 |
| commit | 6a788321deaf163d6ed1e5536034aa2d590fdbf6 (patch) | |
| tree | c0c40a1804e8e63c62bb2794bdc0086ddf0bda40 /distribution/bin/makebindist.py | |
| parent | Updated EJB test (diff) | |
| download | ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.tar.bz2 ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.tar.xz ice-6a788321deaf163d6ed1e5536034aa2d590fdbf6.zip | |
Undo OS X Frameworks updates
Diffstat (limited to 'distribution/bin/makebindist.py')
| -rwxr-xr-x | distribution/bin/makebindist.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py index a3e5a00f729..0c8bdac0355 100755 --- a/distribution/bin/makebindist.py +++ b/distribution/bin/makebindist.py @@ -124,7 +124,6 @@ if not platform.checkAndPrintThirdParties(): buildRootDir = os.path.join(distDir, "..", os.path.join("build-" + platform.pkgPlatform + "-" + version)) srcDir = os.path.join(buildRootDir, "Ice-" + version + "-src") buildDir = os.path.join(buildRootDir, "Ice-" + version) -frameworksDir = os.path.join(buildRootDir, "Frameworks") if forceclean or not os.path.exists(srcDir) or not os.path.exists(buildDir): if os.path.exists(buildRootDir): @@ -185,8 +184,7 @@ for l in buildLanguages: if l != "java": - makeOptions = platform.getMakeOptions() + " " + platform.getMakeEnvs(version, l) + " prefix=" + buildDir + \ - " frameworks_prefix=" + frameworksDir + makeOptions = platform.getMakeOptions() + " " + platform.getMakeEnvs(version, l) + " prefix=" + buildDir if l != "py": buildCmd = "gmake -C src " + makeOptions @@ -234,7 +232,7 @@ if os.path.exists(os.path.join(buildDir, "doc")): print "Copying third party dependencies..." sys.stdout.flush() platform.copyThirdPartyDependencies(buildDir) -platform.completeDistribution(buildDir, frameworksDir, version) +platform.completeDistribution(buildDir, version) # # Copy platform specific files (README, SOURCES, etc) |