Author: rhuijben
Date: Tue May 28 06:18:24 2019
New Revision: 1860175
URL: http://svn.apache.org/viewvc?rev=1860175&view=rev
Log:
Fix compiling Subversion with Visual Studio 2005 and 2008 by properly escaping
the e-mail address we use for the Win32 crash handler.
* build/generator/gen_vcnet_vcproj.py
(quote_define): New function
* build/generator/gen_win.py
(get_win_defines): Quote e-mail address in defines.
(quote_define): Add function (stub).
Modified:
subversion/trunk/build/generator/gen_vcnet_vcproj.py
subversion/trunk/build/generator/gen_win.py
Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=1860175&r1=1860174&r2=1860175&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Tue May 28 06:18:24
2019
@@ -283,3 +283,11 @@ class Generator(gen_win.WinGeneratorBase
}
self.write_with_template('subversion_vcnet.sln',
'templates/vcnet_sln.ezt', data)
+
+ def quote_define(self, targets):
+ "Properly quote special characters in a define (if needed)"
+
+ if self.vcproj_extension == '.vcproj':
+ return value.replace('"', '""')
+ else
+ return value
Modified: subversion/trunk/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1860175&r1=1860174&r2=1860175&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue May 28 06:18:24 2019
@@ -736,9 +736,13 @@ class WinGeneratorBase(gen_win_dependenc
if target.name.endswith('svn_subr'):
fakedefines.append("SVN_USE_WIN32_CRASHHANDLER")
-
fakedefines.append('SVN_WIN32_CRASHREPORT_EMAIL="[email protected]"')
+
fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="[email protected]"'))
return fakedefines
+
+ def quote_define(self, value)
+ "Properly quote special characters in a define (if needed)"
+ return value
def get_win_includes(self, target, cfg='Release'):
"Return the list of include directories for target"
