diff options
| author | Jose <jose@zeroc.com> | 2013-01-17 00:19:08 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-01-17 00:19:08 +0100 |
| commit | 0fe0ab23fda0af323a26b29bc12d2a6a348fced3 (patch) | |
| tree | 0e5d5873b7df9c7a73b3fa66b6ae8a910dde53bc /distribution/bin/makebindist.py | |
| parent | Fixed (ICE-5187) - Glacier2 SessionHelpers cannot load IceSSL plug-in from cu... (diff) | |
| download | ice-0fe0ab23fda0af323a26b29bc12d2a6a348fced3.tar.bz2 ice-0fe0ab23fda0af323a26b29bc12d2a6a348fced3.tar.xz ice-0fe0ab23fda0af323a26b29bc12d2a6a348fced3.zip | |
Added OS X Frameworks
Diffstat (limited to 'distribution/bin/makebindist.py')
| -rwxr-xr-x | distribution/bin/makebindist.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py index 89c7f10eac5..a3e5a00f729 100755 --- a/distribution/bin/makebindist.py +++ b/distribution/bin/makebindist.py @@ -124,6 +124,8 @@ 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): print "Removing previous build from " + os.path.join("build-" + platform.pkgPlatform + "-" + version) + "...", @@ -183,7 +185,9 @@ for l in buildLanguages: if l != "java": - makeOptions = platform.getMakeOptions() + " " + platform.getMakeEnvs(version, l) + " prefix=" + buildDir + makeOptions = platform.getMakeOptions() + " " + platform.getMakeEnvs(version, l) + " prefix=" + buildDir + \ + " frameworks_prefix=" + frameworksDir + if l != "py": buildCmd = "gmake -C src " + makeOptions else: @@ -230,7 +234,7 @@ if os.path.exists(os.path.join(buildDir, "doc")): print "Copying third party dependencies..." sys.stdout.flush() platform.copyThirdPartyDependencies(buildDir) -platform.completeDistribution(buildDir, version) +platform.completeDistribution(buildDir, frameworksDir, version) # # Copy platform specific files (README, SOURCES, etc) |