diff options
author | Jose <jose@zeroc.com> | 2013-09-18 17:15:48 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2013-09-18 17:15:48 +0200 |
commit | 7fbad47395cdbb41d9fce10f38ebedcd71b5409c (patch) | |
tree | 38625b0b973effdab1ee44087cb43fd591cae601 /distribution/lib/BuildUtils.py | |
parent | More testicedist.py improvements (diff) | |
download | ice-7fbad47395cdbb41d9fce10f38ebedcd71b5409c.tar.bz2 ice-7fbad47395cdbb41d9fce10f38ebedcd71b5409c.tar.xz ice-7fbad47395cdbb41d9fce10f38ebedcd71b5409c.zip |
Fixes for Windows configurations
Diffstat (limited to 'distribution/lib/BuildUtils.py')
-rw-r--r-- | distribution/lib/BuildUtils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distribution/lib/BuildUtils.py b/distribution/lib/BuildUtils.py index 9ec2c447008..81009ecaed1 100644 --- a/distribution/lib/BuildUtils.py +++ b/distribution/lib/BuildUtils.py @@ -90,10 +90,10 @@ def getVcVarsAll(compiler): def getJavaHome(arch, configuration): - if configuration == "java1.7": - version = "1.7" - else: + if configuration == "java1.6": version = "1.6" + else: + version = "1.7" import winreg flags = winreg.KEY_READ |