diff options
| author | Brent Eagles <brent@zeroc.com> | 2006-06-08 17:39:28 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2006-06-08 17:39:28 +0000 |
| commit | 20e5bf65239754542362fad8cb9d7472107bc830 (patch) | |
| tree | f6f49ab3a131d9eaf27c258f72bbfe052d4d3b1b /cpp/install/common/makewindist.py | |
| parent | adding WstringWstringMap for release build (diff) | |
| download | ice-20e5bf65239754542362fad8cb9d7472107bc830.tar.bz2 ice-20e5bf65239754542362fad8cb9d7472107bc830.tar.xz ice-20e5bf65239754542362fad8cb9d7472107bc830.zip | |
- Removing PCRE comments from the INSTALL.WINDOWS file.
- Correcting the confiugre command line for the IcePHP SRPM build
Diffstat (limited to 'cpp/install/common/makewindist.py')
| -rwxr-xr-x | cpp/install/common/makewindist.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index 1faf008b96a..2d87c21024b 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -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 == "vc80": + if installVersion in ["vc80", "vc71"]: # # Ice for C++ # @@ -229,8 +229,20 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # os.chdir(os.path.join(sourcesDir, "IceCS-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." + if installVersion == "vc71": + runprog("devenv all_11.sln /useenv /build Debug") + else: + runprog("devenv all.sln /useenv /build Debug") + + # + # Ice for Visual Basic + # + os.chdir(os.path.join(sourcesDir, "IceVB-" + sourcesVersion)) + print "Building in " + os.getcwd() + "..." runprog("devenv all.sln /useenv /build Debug") + if installVersion == "vc80": + # # Ice for PHP # @@ -264,13 +276,6 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): os.chdir(os.path.join(sourcesDir, "IcePy-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." runprog("devenv all.sln /useenv /build Release") - - # - # Ice for Visual Basic - # - os.chdir(os.path.join(sourcesDir, "IceVB-" + sourcesVersion)) - print "Building in " + os.getcwd() + "..." - runprog("devenv all.sln /useenv /build Debug") elif installVersion == "vc60": # # Ice for C++ @@ -279,7 +284,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 ["vc71", "vc80_x64"]: + elif installVersion in ["vc80_x64"]: # # Ice for C++ # |