subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1863288 - in /subversion/branches/1.12.x: ./ STATUS build/generator/gen_vcnet_vcproj.py build/generator/gen_win.py
Date Thu, 18 Jul 2019 13:36:37 GMT
Author: julianfoad
Date: Thu Jul 18 13:36:36 2019
New Revision: 1863288

URL: http://svn.apache.org/viewvc?rev=1863288&view=rev
Log:
Merge the r1860175 group from trunk:

 * r1860175,r1860186,r1860187,r1860188
   Fix building Subversion with Visual Studio 2005 and 2008.
   Justification:
     A change in 1.12 accidentally introduced a macro escaping issue
     which broke compilation with these older versions of VC++.
   Notes:
     Should have been a simple patch. But lack of this version on my
     development machine made things harder.
     (I don't see a problem with dropping VS200 2008 support with
      a future Subversion version, but then we should provide better
      documentation on that change.)
   Votes:
     +1: rhuijben

Modified:
    subversion/branches/1.12.x/   (props changed)
    subversion/branches/1.12.x/STATUS
    subversion/branches/1.12.x/build/generator/gen_vcnet_vcproj.py
    subversion/branches/1.12.x/build/generator/gen_win.py

Propchange: subversion/branches/1.12.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 18 13:36:36 2019
@@ -102,4 +102,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1855419,1856397,1857367,1857391,1863262
+/subversion/trunk:1855419,1856397,1857367,1857391,1860175,1860186-1860188,1863262

Modified: subversion/branches/1.12.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/STATUS?rev=1863288&r1=1863287&r2=1863288&view=diff
==============================================================================
--- subversion/branches/1.12.x/STATUS (original)
+++ subversion/branches/1.12.x/STATUS Thu Jul 18 13:36:36 2019
@@ -21,20 +21,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1860175,r1860186,r1860187,r1860188
-   Fix building Subversion with Visual Studio 2005 and 2008.
-   Justification:
-     A change in 1.12 accidentally introduced a macro escaping issue
-     which broke compilation with these older versions of VC++.
-   Notes:
-     Should have been a simple patch. But lack of this version on my
-     development machine made things harder.
-     (I don't see a problem with dropping VS200 2008 support with
-      a future Subversion version, but then we should provide better
-      documentation on that change.)
-   Votes:
-     +1: rhuijben
-
  * r1859732, r1859734
    io: Implement the functions that check for node existence using the native
    Win32 APIs on Windows.

Modified: subversion/branches/1.12.x/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/build/generator/gen_vcnet_vcproj.py?rev=1863288&r1=1863287&r2=1863288&view=diff
==============================================================================
--- subversion/branches/1.12.x/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/1.12.x/build/generator/gen_vcnet_vcproj.py Thu Jul 18 13:36:36 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, value):
+    "Properly quote special characters in a define (if needed)"
+    
+    if self.vcproj_extension == '.vcproj':
+      return value.replace('"', '""')
+    else:
+      return value

Modified: subversion/branches/1.12.x/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/build/generator/gen_win.py?rev=1863288&r1=1863287&r2=1863288&view=diff
==============================================================================
--- subversion/branches/1.12.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.12.x/build/generator/gen_win.py Thu Jul 18 13:36:36 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="users@subversion.apache.org"')
+      fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="users@subversion.apache.org"'))
 
     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"



Mime
View raw message