summaryrefslogtreecommitdiff
path: root/cpp/install/common/makewindist.py
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2007-02-14 19:10:43 +0000
committerBrent Eagles <brent@zeroc.com>2007-02-14 19:10:43 +0000
commitd5c8706aa2b6655bdd549c208747a19602b2d621 (patch)
tree9ce56f17403410f0cad2f21c7446a14d59aa61ac /cpp/install/common/makewindist.py
parentfixing typo in comment (diff)
downloadice-d5c8706aa2b6655bdd549c208747a19602b2d621.tar.bz2
ice-d5c8706aa2b6655bdd549c208747a19602b2d621.tar.xz
ice-d5c8706aa2b6655bdd549c208747a19602b2d621.zip
update file specs for demo list, generated code should be excluded from the
file staging now
Diffstat (limited to 'cpp/install/common/makewindist.py')
-rwxr-xr-xcpp/install/common/makewindist.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py
index e4b867aab66..8798e5eb9ae 100755
--- a/cpp/install/common/makewindist.py
+++ b/cpp/install/common/makewindist.py
@@ -241,6 +241,9 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
os.chdir(iceHome)
setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False)
+ os.chdir(os.path.join(iceHome, "src"))
+ runprog("nmake /f Makefile.mak")
+ os.chdir(os.path.join(iceHome, "test"))
runprog("nmake /f Makefile.mak")
if installVersion in ["vc80"]:
@@ -315,7 +318,12 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
os.chdir(iceHome)
setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True)
+ os.chdir(os.path.join(iceHome, "src"))
+ runprog("nmake /f Makefile.mak")
+ os.chdir(os.path.join(iceHome, "test"))
runprog("nmake /f Makefile.mak")
+ os.chdir(os.path.join(iceHome, "demo"))
+ runprog("nmake /f Makefile.mak clean")
if installVersion == "vc71":
#
@@ -332,13 +340,6 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion):
if installVersion == "vc60":
#
- # Ice for C++
- #
- os.chdir(os.path.join(sourcesDir, "release", "Ice-" + sourcesVersion))
- setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True)
- print "Building in " + os.getcwd() + "..."
- runprog("nmake /f Makefile.mak")
- #
# Ice for PHP
#
phpBinHome = os.environ['PHP_BIN_HOME']