summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-10-09 22:43:28 (GMT)
committerSteven Knight <knight@baldmt.com>2005-10-09 22:43:28 (GMT)
commit04b10a2b9a5d1be08e3884c2f3ee641359b86989 (patch)
tree60fb1eb955582f3da74f4157906e678ca60c6596 /src
parentdd400bd5b5151853b1fc8960922720725a121f98 (diff)
downloadSCons-04b10a2b9a5d1be08e3884c2f3ee641359b86989.zip
SCons-04b10a2b9a5d1be08e3884c2f3ee641359b86989.tar.gz
SCons-04b10a2b9a5d1be08e3884c2f3ee641359b86989.tar.bz2
Put quotes around the -C directory in command lines in MSVS project files.
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Tool/msvs.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b169fde..2312d58 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -353,6 +353,9 @@ RELEASE 0.97 - XXX
add -tt to the Python invocations in the packaging build and the
tests so they don't creep back in.
+ - In Visual Studio project files, put quotes around the -C directory
+ so everything works even if the path has spaces in it.
+
From Chen Lee:
- Handle Visual Studio project and solution files in Unicode.
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 5542a88..084f1d4 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1419,7 +1419,7 @@ def generate(env):
env['MSVSSCONSCRIPT'] = env.File('SConstruct')
env['MSVSSCONS'] = '"%s" -c "%s"' % (python_executable, exec_script_main)
- env['MSVSSCONSFLAGS'] = '-C ${MSVSSCONSCRIPT.dir.abspath} -f ${MSVSSCONSCRIPT.name}'
+ env['MSVSSCONSFLAGS'] = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f ${MSVSSCONSCRIPT.name}'
env['MSVSSCONSCOM'] = '$MSVSSCONS $MSVSSCONSFLAGS'
env['MSVSBUILDCOM'] = '$MSVSSCONSCOM $MSVSBUILDTARGET'
env['MSVSREBUILDCOM'] = '$MSVSSCONSCOM $MSVSBUILDTARGET'