diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-03-08 18:13:47 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-03-08 18:13:47 +0000 |
| commit | 00d527ad9b95db627f8f774049310a18d1f7abac (patch) | |
| tree | 1d735d54b77dc06ceb2d5a8c16f2858aa90d9369 /cpp/newmakebindist.py | |
| parent | fix (diff) | |
| download | ice-00d527ad9b95db627f8f774049310a18d1f7abac.tar.bz2 ice-00d527ad9b95db627f8f774049310a18d1f7abac.tar.xz ice-00d527ad9b95db627f8f774049310a18d1f7abac.zip | |
fix ant task removal
Diffstat (limited to 'cpp/newmakebindist.py')
| -rwxr-xr-x | cpp/newmakebindist.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index 5a04855e0d5..793bddbbc2d 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -88,6 +88,8 @@ def collectSourceDistributions(tag, sourceDir, cvsdir, distro): are going to go get them ourselves""" cwd = os.getcwd() os.chdir(cwd + "/../" + cvsdir) + if len(tag) > 0: + print 'Making disribution ' + cvsdir + ' with tag ' + tag if cvsdir == "icepy" or cvsdir == "ice": os.system("./makedist.py " + tag) else: @@ -270,6 +272,7 @@ def makeInstall(sources, buildDir, installDir, distro, clean): # work) than shutil.copytree(). # os.system("cp -pR " + buildDir + "/" + distro + "/ant " + installDir) + os.system('find ' + installDir + '/ant -name "*.java" | xargs rm') os.chdir(cwd) return @@ -590,7 +593,7 @@ def main(): if d == "icej": shutil.copy("lib/Ice.jar", installDir +"/Ice-" + version + "/lib") os.system("cp -pR ant " + installDir + "/Ice-" + version) - os.system('find ' + installDir + 'Ice-' + version + ' -name "*.java" | xargs rm') + os.system('find ' + installDir + '/Ice-' + version + ' -name "*.java" | xargs rm') else: os.system("perl -pi -e 's/^prefix.*$/prefix = \$\(INSTALL_ROOT\)/' config/Make.rules") os.system("gmake INSTALL_ROOT=" + installDir + "/Ice-" + version + " install") |