diff options
| author | LaurentMarchelli <devnull@localhost> | 2015-02-12 14:56:20 +0100 |
|---|---|---|
| committer | LaurentMarchelli <devnull@localhost> | 2015-02-12 14:56:20 +0100 |
| commit | 7e8b998e6e4174389d8754f7a20ab565b1dc8429 (patch) | |
| tree | aa95909920af7718575470375b52fee2996f5a6a | |
| parent | a9d2af180c9917c0e7b5603b77c4fd2717903eb3 (diff) | |
| download | scons-7e8b998e6e4174389d8754f7a20ab565b1dc8429.tar.gz | |
dumb error and output improvement.
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index 071cb7b1..d00413d1 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -63,6 +63,7 @@ def xmlify(s): s = s.replace("&", "&") # do this first s = s.replace("'", "'") s = s.replace('"', """) + s = s.replace('\n', '
') return s # Process a CPPPATH list in includes, given the env, target and source. @@ -224,7 +225,7 @@ class _UserGenerator(object): dbg_settings = [] elif SCons.Util.is_Dict(env['DebugSettings']): dbg_settings = [env['DebugSettings']] - elif SCons.Util.is_List(env['dbg_settings']): + elif SCons.Util.is_List(env['DebugSettings']): if len(env['DebugSettings']) != len(variants): raise SCons.Errors.InternalError("Sizes of 'DebugSettings' and 'variant' lists must be the same.") dbg_settings = [] @@ -332,10 +333,11 @@ class _GenerateV7User(_UserGenerator): variant = self.configs[kind].variant platform = self.configs[kind].platform debug = self.configs[kind].debug - debug_settings = '\n'.join(['\t\t\t\t%s="%s"' % (key, xmlify(value)) - for key, value in debug.items() - if value is not None]) - self.usrfile.write(self.usrconf % locals()) + if debug: + debug_settings = '\n'.join(['\t\t\t\t%s="%s"' % (key, xmlify(value)) + for key, value in debug.items() + if value is not None]) + self.usrfile.write(self.usrconf % locals()) self.usrfile.write('\t</Configurations>\n</VisualStudioUserFile>') V10UserHeader = """\ @@ -393,10 +395,11 @@ class _GenerateV10User(_UserGenerator): variant = self.configs[kind].variant platform = self.configs[kind].platform debug = self.configs[kind].debug - debug_settings = '\n'.join(['\t\t<%s>%s</%s>' % (key, xmlify(value), key) - for key, value in debug.items() - if value is not None]) - self.usrfile.write(self.usrconf % locals()) + if debug: + debug_settings = '\n'.join(['\t\t<%s>%s</%s>' % (key, xmlify(value), key) + for key, value in debug.items() + if value is not None]) + self.usrfile.write(self.usrconf % locals()) self.usrfile.write('</Project>') class _DSPGenerator(object): |