diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-06-15 09:21:32 +0000 |
| commit | 07fc59e19636a4fc97a18b2038f3fe1c72a94000 (patch) | |
| tree | 79d4a6239d81b2ccb4752d4f5ca25e0a7d3b4d4b /engine/SCons/Tool/mwcc.py | |
| parent | 7f642861f3946d4241cbd668de258293ba92767a (diff) | |
| parent | 340d57481935334465037d97c0db1555b70c0eb1 (diff) | |
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'engine/SCons/Tool/mwcc.py')
| -rw-r--r-- | engine/SCons/Tool/mwcc.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engine/SCons/Tool/mwcc.py b/engine/SCons/Tool/mwcc.py index ec97ab5..fe6f0b3 100644 --- a/engine/SCons/Tool/mwcc.py +++ b/engine/SCons/Tool/mwcc.py @@ -30,11 +30,10 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/mwcc.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Tool/mwcc.py 5023 2010/06/14 22:05:46 scons" import os import os.path -import string import SCons.Util @@ -80,8 +79,8 @@ def set_vars(env): ENV['CWFolder'] = version.path ENV['LM_LICENSE_FILE'] = version.license plus = lambda x: '+%s' % x - ENV['MWCIncludes'] = string.join(map(plus, version.includes), os.pathsep) - ENV['MWLibraries'] = string.join(map(plus, version.libs), os.pathsep) + ENV['MWCIncludes'] = os.pathsep.join(map(plus, version.includes)) + ENV['MWLibraries'] = os.pathsep.join(map(plus, version.libs)) return 1 @@ -100,7 +99,7 @@ def find_versions(): product_key = SCons.Util.RegOpenKeyEx(HLM, product) i = 0 - while 1: + while True: name = product + '\\' + SCons.Util.RegEnumKey(product_key, i) name_key = SCons.Util.RegOpenKeyEx(HLM, name) @@ -120,7 +119,7 @@ def find_versions(): return versions -class MWVersion: +class MWVersion(object): def __init__(self, version, path, platform): self.version = version self.path = path |