From 6633eef18be6e4d7f1339f9028fa87f8e8dea9fd Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 16 Apr 2015 01:48:15 +0000 Subject: [PATCH] Fix spurious quote on version string --- SConstruct | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index edda8b0bb..fc22b4aab 100644 --- a/SConstruct +++ b/SConstruct @@ -1411,10 +1411,10 @@ class DXXCommon(LazyObjectConstructor): self.env['BUILDERS']['StaticObject'].add_emitter('.cpp', self._collect_pch_candidates) self.env.Command(source, None, self.write_pch_inclusion_file) - def _quote_cppdefine(self,s): + def _quote_cppdefine(self,s,f=repr): r = '' prior = False - for c in repr(s): + for c in f(s): # No xdigit support in str if c in ' ()*+,-./:=[]_' or (c.isalnum() and not (prior and (c.isdigit() or c in 'abcdefABCDEF'))): r += c @@ -2060,7 +2060,7 @@ class DXXProgram(DXXCommon): extra_version += ' ' extra_version += git_describe_version[0] if extra_version: - versid_cppdefines.append(('DESCENT_VERSION_EXTRA', self._quote_cppdefine(extra_version))) + versid_cppdefines.append(('DESCENT_VERSION_EXTRA', self._quote_cppdefine(extra_version, f=str))) versid_cppdefines.append(('DESCENT_git_status', self._quote_cppdefine(git_describe_version[1]))) versid_build_environ.append('git_status') versid_cppdefines.append(('DESCENT_git_diffstat', self._quote_cppdefine(git_describe_version[2])))