diff options
author | Brent Eagles <brent@zeroc.com> | 2006-06-21 18:29:13 +0000 |
---|---|---|
committer | Brent Eagles <brent@zeroc.com> | 2006-06-21 18:29:13 +0000 |
commit | 649b2093521c3f8de5e0629aba69736ef9f5c6e5 (patch) | |
tree | b417512fa48ec37ed092a5856bfb3d775b23139d /cpp/install/common/makewindist.py | |
parent | Update the 64 bit project. (diff) | |
download | ice-649b2093521c3f8de5e0629aba69736ef9f5c6e5.tar.bz2 ice-649b2093521c3f8de5e0629aba69736ef9f5c6e5.tar.xz ice-649b2093521c3f8de5e0629aba69736ef9f5c6e5.zip |
installer creating fixes and adding some missing comments to
Glacier2/Session.ice
Diffstat (limited to 'cpp/install/common/makewindist.py')
-rwxr-xr-x | cpp/install/common/makewindist.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/install/common/makewindist.py b/cpp/install/common/makewindist.py index 599368f9dfb..ece421f9d75 100755 --- a/cpp/install/common/makewindist.py +++ b/cpp/install/common/makewindist.py @@ -210,7 +210,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # # Ice for C++ # - os.chdir(iceHome) + os.chdir(os.path.join(sourcesDir, "Ice-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." runprog("devenv all.sln /useenv /build Debug") runprog("devenv all.sln /useenv /build Release") @@ -280,7 +280,7 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # # Ice for C++ # - os.chdir(iceHome) + os.chdir(os.path.join(sourcesDir, "Ice-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." runprog('msdev all.dsw /useenv /make "all - Win32 Debug"') runprog('msdev all.dsw /useenv /make "all - Win32 Release"') @@ -288,10 +288,10 @@ def buildIceDists(stageDir, sourcesDir, sourcesVersion, installVersion): # # Ice for C++ # - os.chdir(iceHome) + os.chdir(os.path.join(sourcesDir, "Ice-" + sourcesVersion)) print "Building in " + os.getcwd() + "..." - runprog("devenv all.sln /useenv /build Debug") - runprog("devenv all.sln /useenv /build Release") + runprog('devenv all.sln /useenv /build Debug /project all') + runprog('devenv all.sln /useenv /build Release /project all') def list2english(l): if len(l) == 1: @@ -513,8 +513,8 @@ def main(): try: optionList, args = getopt.getopt( sys.argv[1:], "dhil:", [ "help", "clean", "skip-build", "skip-installer", "info", "debug", - "logfile", "vc60", "vc71", "vc80", "vc80_x64", "sslhome=", "expathome=", "dbhome=", "stlporthome=", "bzip2home=", - "thirdparty="]) + "logfile", "vc60", "vc71", "vc80", "vc80_x64", "sslhome=", "expathome=", "dbhome=", "stlporthome=", + "bzip2home=", "thirdparty="]) except getopt.GetoptError: usage() sys.exit(2) |