diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-02-15 20:27:46 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-02-15 20:27:46 +0000 |
| commit | 29c6f7575a07c75ef595003d29b2ec9b6bbcc7d4 (patch) | |
| tree | 5a1945dc49c05137817871106f394184f92564d4 | |
| parent | adding missing icegrid replication to workspace (diff) | |
| download | ice-29c6f7575a07c75ef595003d29b2ec9b6bbcc7d4.tar.bz2 ice-29c6f7575a07c75ef595003d29b2ec9b6bbcc7d4.tar.xz ice-29c6f7575a07c75ef595003d29b2ec9b6bbcc7d4.zip | |
bug fixin'
| -rwxr-xr-x | cpp/install/common/components/ice.config.files | 1 | ||||
| -rwxr-xr-x | cpp/install/common/components/ice.runtime.exes | 1 | ||||
| -rwxr-xr-x | cpp/install/common/components/icevb.demo | 1 | ||||
| -rwxr-xr-x | cpp/install/common/makewindist.py | 8 |
4 files changed, 7 insertions, 4 deletions
diff --git a/cpp/install/common/components/ice.config.files b/cpp/install/common/components/ice.config.files index c907b4e224d..9243809f541 100755 --- a/cpp/install/common/components/ice.config.files +++ b/cpp/install/common/components/ice.config.files @@ -1,4 +1,5 @@ templates.xml
convertssl.py
upgradeicegrid.py
+upgradeicestorm.py
icegrid-slice.3.1.ice.gz
diff --git a/cpp/install/common/components/ice.runtime.exes b/cpp/install/common/components/ice.runtime.exes index 8d07b5d278a..cf1eaaa2c77 100755 --- a/cpp/install/common/components/ice.runtime.exes +++ b/cpp/install/common/components/ice.runtime.exes @@ -12,3 +12,4 @@ slice2docbook.exe icegridadmin.exe icegridnode.exe icegridregistry.exe +iceca.bat diff --git a/cpp/install/common/components/icevb.demo b/cpp/install/common/components/icevb.demo index 3d1f44ad681..0f476a59900 100755 --- a/cpp/install/common/components/icevb.demo +++ b/cpp/install/common/components/icevb.demo @@ -11,6 +11,7 @@ # include=**/*.* exclude=**/*.exe +exclude=**/*.exe.config exclude=**/*.pdb exclude=**/*.dll exclude=**/*.bat diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index 8798e5eb9ae..bda15774203 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -252,8 +252,8 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # os.chdir(os.path.join(sourcesDir, "debug", "IceCS-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." - setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False) - setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) + setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), False) + setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), True) runprog("nmake /f Makefile.mak") @@ -280,8 +280,8 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # os.chdir(os.path.join(sourcesDir, "release", "IceCS-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." - setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak"), True) - setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak"), False) + setOptimize(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), True) + setDebug(os.path.join(os.getcwd(), "config", "Make.rules.mak.cs"), False) runprog("nmake /f Makefile.mak") # |