diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-03-08 01:43:07 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-03-08 01:43:07 +0000 |
| commit | 7ba56ccf489feff6fff81e874ef6f797f6249520 (patch) | |
| tree | 26447da50f4fb99d6f2f778f2ea92583519e12f7 /cpp/newmakebindist.py | |
| parent | more quiet -> zip flags (diff) | |
| download | ice-7ba56ccf489feff6fff81e874ef6f797f6249520.tar.bz2 ice-7ba56ccf489feff6fff81e874ef6f797f6249520.tar.xz ice-7ba56ccf489feff6fff81e874ef6f797f6249520.zip | |
demo packages are now only created on Linux. Linux is the best platform for
creating these packages since it supports all of the mappings that will
go into the demos
Diffstat (limited to 'cpp/newmakebindist.py')
| -rwxr-xr-x | cpp/newmakebindist.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index 717370ac235..856c281cca0 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -236,7 +236,8 @@ def archiveDemoTree(buildDir, version): # # Remove Windows project files. # - os.system("sh -c 'for f in `find Ice-" + version + "-demos -regex \".*\.ds[wp]\" ` ; do rm -rf $f ; done'") + os.system("sh -c 'for f in `find Ice-" + version + "-demos -name \"*\.dsp\" ` ; do rm -rf $f ; done'") + os.system("sh -c 'for f in `find Ice-" + version + "-demos -name \"*\.dsw\" ` ; do rm -rf $f ; done'") os.system("sh -c 'for f in `find Ice-" + version + "-demos/democs -name \"*.sln\" ` ; do rm -rf $f ; done'") os.system("sh -c 'for f in `find Ice-" + version + "-demos/democs -name \"*.csproj\" ` ; do rm -rf $f ; done'") @@ -550,16 +551,17 @@ def main(): for cvs, tarball, demoDir in sourceTarBalls: if collectSources: collectSourceDistributions(cvsTag, sources, cvs, tarball) - - extractDemos(sources, buildDir, version, tarball, demoDir) + if getPlatform() == "linux": + extractDemos(sources, buildDir, version, tarball, demoDir) makeInstall(sources, buildDir, installDir + "/Ice-" + version, tarball, clean) # # Pack up demos # - archiveDemoTree(buildDir, version) - shutil.move(buildDir + "/Ice-" + version + "-demos.tar.gz", installDir + "/Ice-" + version + "-demos.tar.gz") - shutil.move(buildDir + "/Ice-" + version + "-demos.zip", installDir + "/Ice-" + version + "-demos.zip") + if getPlatform() == "linux": + archiveDemoTree(buildDir, version) + shutil.move(buildDir + "/Ice-" + version + "-demos.tar.gz", installDir + "/Ice-" + version + "-demos.tar.gz") + shutil.move(buildDir + "/Ice-" + version + "-demos.zip", installDir + "/Ice-" + version + "-demos.zip") elif cvsMode: collectSources = False |