diff options
| author | Steven Knight <knight@baldmt.com> | 2004-08-20 04:16:14 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-08-20 04:16:14 (GMT) |
| commit | 84f00012c6e961df55c666abcfa1477578c81c34 (patch) | |
| tree | d8392f44424aaf41fd3bb2e0e1cd723acced99bf | |
| parent | 724ac93fb566028ff0f0afad67576fa91f5e5892 (diff) | |
| download | SCons-84f00012c6e961df55c666abcfa1477578c81c34.zip SCons-84f00012c6e961df55c666abcfa1477578c81c34.tar.gz SCons-84f00012c6e961df55c666abcfa1477578c81c34.tar.bz2 | |
Handle white space in the Python path name inside. Handle
| -rw-r--r-- | src/CHANGES.txt | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 48016c4..52c3809 100644 --- 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 ead57f2..a173c3e 100644 --- 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) |