diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-02-21 02:56:42 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-02-21 02:56:42 +0000 |
| commit | aa6279c29b0c5e4e0877aeaade0f53c9d90fa0bf (patch) | |
| tree | a410d1b7232287865c27d7a1d536a8a437e6eeab /cpp/newmakebindist.py | |
| parent | Removing usage of import task from the demo build.xml files and replacing (diff) | |
| download | ice-aa6279c29b0c5e4e0877aeaade0f53c9d90fa0bf.tar.bz2 ice-aa6279c29b0c5e4e0877aeaade0f53c9d90fa0bf.tar.xz ice-aa6279c29b0c5e4e0877aeaade0f53c9d90fa0bf.zip | |
attempting to get hands off builds on non-linux platforms
Diffstat (limited to 'cpp/newmakebindist.py')
| -rwxr-xr-x | cpp/newmakebindist.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index 6a22e6c45ab..fab49f56d96 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -468,7 +468,7 @@ def extractDemos(buildDir, version, distro, demoDir): # The RPM configuration is the only one that cares about Ice # version numbers. # - os.system("perl -pi -e 's/ICE_VERSION/" + version + "/' common.rpm.xml") + os.system("perl -pi -e 's/ICE_VERSION/" + version + "/' common.xml") os.chdir(tcwd) shutil.rmtree(buildDir + "/demotree/" + distro, True) @@ -568,6 +568,15 @@ def makeInstall(buildDir, installDir, distro, clean): os.system("perl -pi -e 's/^PYTHON.HOME.*$/PYTHON\_HOME \?= "+ pyHome.replace("/", "\/") + \ "/' config/Make.rules") + + if distro.startswith("Ice-"): + if getPlatform() <> "linux": + os.system("perl -pi -e 's/^#(BZIP2_HOME)/$1/' config/Make.rules") + os.system("perl -pi -e 's/^#(DB_HOME)/$1/' config/Make.rules") + os.system("perl -pi -e 's/^#(OPENSSL_HOME)/$1/' config/Make.rules") + os.system("perl -pi -e 's/^#(EXPAT_HOME)/$1/' config/Make.rules") + os.system("perl -pi -e 's/^#(READLINE_HOME)/$1/' config/Make.rules") + os.system("gmake OPTIMIZE=yes RPM_BUILD_ROOT=" + installDir + " install") os.chdir(cwd) |