From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sun, 22 Feb 2009 15:33:05 +0000 (+0000)
Subject: Python 1.5 portability in last patch.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=935a531597e16b9d4e683064081baa668f007e40;p=scons.git

Python 1.5 portability in last patch.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@4038 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index e0f31dd3..2862f719 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -686,8 +686,11 @@ class _GenerateV7DSP(_DSPGenerator):
             rebuildcmd  = xmlify(starting + self.env.subst('$MSVSREBUILDCOM', 1) + cmdargs)
             cleancmd    = xmlify(starting + self.env.subst('$MSVSCLEANCOM', 1) + cmdargs)
 
-            preprocdefs = xmlify(';'.join(self.env.get('CPPDEFINES', [])))
-            includepath = xmlify(';'.join(self.env.get('CPPPATH', [])))
+            # TODO(1.5)
+            #preprocdefs = xmlify(';'.join(self.env.get('CPPDEFINES', [])))
+            #includepath = xmlify(';'.join(self.env.get('CPPPATH', [])))
+            preprocdefs = xmlify(string.join(self.env.get('CPPDEFINES', []), ';'))
+            includepath = xmlify(string.join(self.env.get('CPPPATH', []), ';'))
 
             if not env_has_buildtarget:
                 del self.env['MSVSBUILDTARGET']