diff options
| -rwxr-xr-x | distribution/bin/makebindist.py | 3 | ||||
| -rw-r--r-- | distribution/lib/DistUtils.py | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/distribution/bin/makebindist.py b/distribution/bin/makebindist.py index 85350acab31..c891e26fdd1 100755 --- a/distribution/bin/makebindist.py +++ b/distribution/bin/makebindist.py @@ -203,8 +203,7 @@ for l in buildLanguages: jgoodiesDefines = "-Djgoodies.forms=" + platform.getJGoodiesForms() + " -Djgoodies.looks=" + \ platform.getJGoodiesLooks() - if os.system(antCmd + " -Dbuild.suffix=-java2 -Dice.mapping=java2 install") != 0 or \ - os.system(antCmd + " -Dbuild.suffix=-java5 -Dice.mapping=java5 " + jgoodiesDefines + " install") != 0: + if os.system(antCmd + " " + jgoodiesDefines + " install") != 0: print sys.argv[0] + ": `" + l + "' build failed" os.chdir(cwd) sys.exit(1) diff --git a/distribution/lib/DistUtils.py b/distribution/lib/DistUtils.py index 3c66e3d4932..e53f6093d24 100644 --- a/distribution/lib/DistUtils.py +++ b/distribution/lib/DistUtils.py @@ -798,6 +798,13 @@ class Darwin(Platform): links.append(link[len(root) + 1::]) return libraries + links + def getMakeEnvs(self, version, language): + envs = Platform.getMakeEnvs(self, version, language) + # Build fat binaries by default. + if not os.environ.has_key("CXXARCHFLAGS"): + envs += " CXXARCHFLAGS=\"-arch i386 -arch x86_64\""; + return envs + def completeDistribution(self, buildDir, version): print "Fixing install names...", @@ -887,7 +894,7 @@ class Expat(ThirdParty): ThirdParty.__init__(self, platform, "Expat", expat, ["cpp"]) def getFilesFromSubDirs(self, platform, bindir, libdir, x64): - return platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "*")) + return platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "libexpat*")) class OpenSSL(ThirdParty): def __init__(self, platform): @@ -896,7 +903,8 @@ class OpenSSL(ThirdParty): def getFilesFromSubDirs(self, platform, bindir, libdir, x64): files = [ os.path.join(bindir, "openssl") ] - files += platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "*")) + files += platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "libssl*")) + files += platform.getSharedLibraryFiles(self.location, os.path.join(libdir, "libcrypto*")) return files class Mcpp(ThirdParty): |