Handle white space in the Python path name inside. Handle

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 48016c448a84c29839388aaf8494c8333f8db10e..52c38094363e06b9f6d2d1ed8d9539b1aee0cee0 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,6 +10,14 @@
 
 RELEASE 0.97 - XXX
 
+  From Craig Bachelor:
+
+  - Handle white space in the executable Python path name within in MSVS
+    project files by quoting the path.
+
+  - Correct the format of a GUID string in a solution (.dsw) file so
+    MSVS can correctly "build enable" a project.
+
   From Steven Knight:
 
   - Add a must_exist flag to Delete() to let the user control whether

diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index ead57f235ad79defc9175bc7a0937427b6da051d..a173c3efa9bb2242343a3611efd2b0a63d762c25 100644 (file)
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -74,7 +74,7 @@ def _generateGUID(slnfile, name):
     change with each invocation."""
     solution = _hexdigest(md5.new(str(slnfile)+str(name)).digest()).upper()
     # convert most of the signature to GUID form (discard the rest)
-    solution = "{" + solution[:8] + "-" + solution[8:12] + "-" + solution[12:16] + "-" + solution[16:28] + "}"
+    solution = "{" + solution[:8] + "-" + solution[8:12] + "-" + solution[12:16] + "-" + solution[16:20] + "-" + solution[20:32] + "}"
     return solution
 
 # This is how we re-invoke SCons from inside MSVS Project files.
@@ -256,9 +256,9 @@ class _GenerateV6DSP(_DSPGenerator):
                 self.file.write('# PROP %sOutput_Dir "%s"\n'
                                 '# PROP %sIntermediate_Dir "%s"\n' % (base,outdir,base,outdir))
                 (d,c) = os.path.split(str(self.conspath))
-                cmd = '%s -c "%s" -C %s -f %s %s' % (python_executable,
-                                                     exec_script_main,
-                                                     d, c, buildtarget)
+                cmd = '"%s" -c "%s" -C %s -f %s %s' % (python_executable,
+                                                       exec_script_main,
+                                                       d, c, buildtarget)
                 self.file.write('# PROP %sCmd_Line "%s"\n' 
                                 '# PROP %sRebuild_Opt "-c && %s"\n'
                                 '# PROP %sTarget_File "%s"\n'
@@ -414,11 +414,11 @@ class _GenerateV7DSP(_DSPGenerator):
             buildtarget = self.configs[kind].buildtarget
 
             (d,c) = os.path.split(str(self.conspath))
-            cmd = '%s -c "%s" -C %s -f %s %s' % (python_executable,
+            cmd = '"%s" -c "%s" -C %s -f %s %s' % (python_executable,
                                                    exec_script_main_xml,
                                                    d, c, buildtarget)
 
-            cleancmd = '%s -c "%s" -C %s -f %s -c %s' % (python_executable,
+            cleancmd = '"%s" -c "%s" -C %s -f %s -c %s' % (python_executable,
                                                          exec_script_main_xml,
                                                          d, c, buildtarget)