diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-02-14 19:10:43 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-02-14 19:10:43 +0000 |
| commit | d5c8706aa2b6655bdd549c208747a19602b2d621 (patch) | |
| tree | 9ce56f17403410f0cad2f21c7446a14d59aa61ac | |
| parent | fixing typo in comment (diff) | |
| download | ice-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
| -rwxr-xr-x | cpp/install/common/components/ice.demo.vc60 | 1 | ||||
| -rwxr-xr-x | cpp/install/common/components/ice.demo.vc71 | 1 | ||||
| -rwxr-xr-x | cpp/install/common/components/ice.demo.vc80 | 1 | ||||
| -rwxr-xr-x | cpp/install/common/components/ice.demo.vc80_x64 | 1 | ||||
| -rwxr-xr-x | cpp/install/common/makewindist.py | 15 |
5 files changed, 12 insertions, 7 deletions
diff --git a/cpp/install/common/components/ice.demo.vc60 b/cpp/install/common/components/ice.demo.vc60 index 9ec1c687a01..18c6b8df89b 100755 --- a/cpp/install/common/components/ice.demo.vc60 +++ b/cpp/install/common/components/ice.demo.vc60 @@ -7,6 +7,7 @@ exclude=**/*.obj exclude=**/*.ilk exclude=**/*.pdb exclude=**/*.idb +exclude=**/*.lib exclude=**/*.dll exclude=**/*.plg exclude=**/*.depend diff --git a/cpp/install/common/components/ice.demo.vc71 b/cpp/install/common/components/ice.demo.vc71 index 986354019eb..c67f668131c 100755 --- a/cpp/install/common/components/ice.demo.vc71 +++ b/cpp/install/common/components/ice.demo.vc71 @@ -7,6 +7,7 @@ exclude=**/*.suo exclude=**/*.exe exclude=**/*.ilk exclude=**/*.pdb +exclude=**/*.lib exclude=**/*.idb exclude=**/*.plg exclude=**/*.depend diff --git a/cpp/install/common/components/ice.demo.vc80 b/cpp/install/common/components/ice.demo.vc80 index aad77980bfa..ff9447e9754 100755 --- a/cpp/install/common/components/ice.demo.vc80 +++ b/cpp/install/common/components/ice.demo.vc80 @@ -10,6 +10,7 @@ exclude=**/*.obj exclude=**/*.dll exclude=**/*.pdb exclude=**/*.idb +exclude=**/*.lib exclude=**/*.plg exclude=**/*.depend exclude=**/*.dummy diff --git a/cpp/install/common/components/ice.demo.vc80_x64 b/cpp/install/common/components/ice.demo.vc80_x64 index aad77980bfa..ff9447e9754 100755 --- a/cpp/install/common/components/ice.demo.vc80_x64 +++ b/cpp/install/common/components/ice.demo.vc80_x64 @@ -10,6 +10,7 @@ exclude=**/*.obj exclude=**/*.dll exclude=**/*.pdb exclude=**/*.idb +exclude=**/*.lib exclude=**/*.plg exclude=**/*.depend exclude=**/*.dummy 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'] |