OPEN-66 Update autobuilds default VC version to 2010
Review Request #305 - Created May 16, 2011 and submitted
| Ima Mechanique | Reviewers | ||
| viewer | |||
| open-66 | |||
| None | autobuild | ||
Autobuild defaults to VC 2005 if the environment variable AUTOBUILD_VSVER is unset. Now that LL have moved to VC 2010 completely, shouldn't this become the default version?
Expand changes
Hide Extra Whitespace| autobuild/autobuild_tool_source_environment.py | |||
|---|---|---|---|
| Revision 2a560b1d8f95 | New Change | ||
| ... | 264 lines hidden [Expand] | ||
def do_source_environment(args): |
|||
| 265 |
if common.get_current_platform() is "windows": |
265 |
if common.get_current_platform() is "windows": |
| 266 |
try: |
266 |
try: |
| 267 |
# reset stdout in binary mode so sh doesn't get confused by '\r'
|
267 |
# reset stdout in binary mode so sh doesn't get confused by '\r'
|
| 268 |
import msvcrt |
268 |
import msvcrt |
| 269 |
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
269 |
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) |
| 270 |
except ImportError: |
270 |
except ImportError: |
| 271 |
# cygwin gets a pass
|
271 |
# cygwin gets a pass
|
| 272 |
pass
|
272 |
pass
|
| 273 | 273 | ||
| 274 |
# load vsvars32.bat variables
|
274 |
# load vsvars32.bat variables
|
| 275 | # *TODO - find a way to configure this instead of hardcoding to vc80 |
275 | # *TODO - find a way to configure this instead of hardcoding to vc100 |
| 276 |
try: |
276 |
try: |
| 277 |
vs_ver = os.environ['AUTOBUILD_VSVER'] |
277 |
vs_ver = os.environ['AUTOBUILD_VSVER'] |
| 278 |
except KeyError: |
278 |
except KeyError: |
| 279 | vs_ver = "80" |
279 | vs_ver = "100" |
| 280 |
|
280 |
|
| 281 |
var_mapping.update(load_vsvars(vs_ver)) |
281 |
var_mapping.update(load_vsvars(vs_ver)) |
| 282 |
var_mapping.update(AUTOBUILD_EXECUTABLE_PATH=("$(cygpath -u '%s')" % common.get_autobuild_executable_path())) |
282 |
var_mapping.update(AUTOBUILD_EXECUTABLE_PATH=("$(cygpath -u '%s')" % common.get_autobuild_executable_path())) |
| 283 | 283 | ||
| 284 |
try: |
284 |
try: |
| 285 |
use_ib = int(os.environ['USE_INCREDIBUILD']) |
285 |
use_ib = int(os.environ['USE_INCREDIBUILD']) |
| 286 |
except ValueError: |
286 |
except ValueError: |
| 287 |
logger.warning("USE_INCREDIBUILD environment variable contained garbage %r (expected 0 or 1), turning incredibuild off" % os.environ['USE_INCREDIBUILD']) |
287 |
logger.warning("USE_INCREDIBUILD environment variable contained garbage %r (expected 0 or 1), turning incredibuild off" % os.environ['USE_INCREDIBUILD']) |
| 288 |
use_ib = 0 |
288 |
use_ib = 0 |
| 289 |
except KeyError: |
289 |
except KeyError: |
| ... | 25 lines hidden [Expand] | ||
Other reviews