diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-06-07 11:36:16 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-06-07 11:36:16 +0000 |
| commit | 9c0a926d353547c31265caf17919f5ec356bbdcb (patch) | |
| tree | f8786af275d75c1d834f5180c0c42ae4340e324c /cpp/install/common/makewindist.py | |
| parent | Updates to distribution tools and RPM scripting (diff) | |
| download | ice-9c0a926d353547c31265caf17919f5ec356bbdcb.tar.bz2 ice-9c0a926d353547c31265caf17919f5ec356bbdcb.tar.xz ice-9c0a926d353547c31265caf17919f5ec356bbdcb.zip | |
- Updated several InstallShield projects to reflect Ice version 3.1.0.
- Updated a C++ demo lists for VC6 and VC8
- Updated certificate and key file lists.
- Moved components from VC71 to VC80 is installer file staging
scripts/datasets.
- Added FilterManager.cpp source file to glacier2router project.
Diffstat (limited to 'cpp/install/common/makewindist.py')
| -rwxr-xr-x | cpp/install/common/makewindist.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index e5e1c952b69..1faf008b96a 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -76,7 +76,7 @@ def environmentCheck(target): required = ["SOURCES", "BUILD_DIR", "DB_HOME", "BZIP2_HOME", "EXPAT_HOME", "OPENSSL_HOME"] if target == "vc60": required.append("STLPORT_HOME") - elif target == "vc71": + elif target == "vc80": required.extend(["PHP_BIN_HOME", "PHP_SRC_HOME", "PYTHON_HOME"]) fail = False @@ -206,7 +206,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): prependEnvPath('LIB', os.path.join(iceHome, "lib")) prependEnvPath('INCLUDE', os.path.join(iceHome, "include")) - if installVersion == "vc71": + if installVersion == "vc80": # # Ice for C++ # @@ -279,7 +279,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): print "Building in " + os.getcwd() + "..." runprog('msdev all.dsw /useenv /make "all - Win32 Debug"') runprog('msdev all.dsw /useenv /make "all - Win32 Release"') - elif installVersion in ["vc80", "vc80_x64"]: + elif installVersion in ["vc71", "vc80_x64"]: # # Ice for C++ # |