subversion-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1863286&view=rev
Log:
Merge r1856397 from trunk:

 * r1856397
   Allow generating Visual Studio 2019 projects
   Justification:
     Makes it easier to build Subversion on Windows. Simple local fix.
   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_win_dependencies.py

Propchange: subversion/branches/1.12.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 18 13:36:17 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,1857391,1863262
+/subversion/trunk:1855419,1856397,1857391,1863262

Modified: subversion/branches/1.12.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/STATUS?rev=1863286&r1=1863285&r2=1863286&view=diff
==============================================================================
--- subversion/branches/1.12.x/STATUS (original)
+++ subversion/branches/1.12.x/STATUS Thu Jul 18 13:36:17 2019
@@ -21,13 +21,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1856397
-   Allow generating Visual Studio 2019 projects
-   Justification:
-     Makes it easier to build Subversion on Windows. Simple local fix.
-   Votes:
-     +1: rhuijben
-
  * r1857367
     Fix memory lifetime problem in a libsvn_wc error code path.
     Justification:

Modified: subversion/branches/1.12.x/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.12.x/build/generator/gen_win_dependencies.py?rev=1863286&r1=1863285&r2=1863286&view=diff
==============================================================================
--- subversion/branches/1.12.x/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/1.12.x/build/generator/gen_win_dependencies.py Thu Jul 18 13:36:17
2019
@@ -267,6 +267,11 @@ class GenDependenciesBase(gen_base.Gener
           self.sln_version = '12.00'
           self.vcproj_version = '14.1'
           self.vcproj_extension = '.vcxproj'
+        elif val == '2019' or val == '16':
+          self.vs_version = '2019'
+          self.sln_version = '12.00'
+          self.vcproj_version = '14.2'
+          self.vcproj_extension = '.vcxproj'
         elif re.match('^20\d+$', val):
           print('WARNING: Unknown VS.NET version "%s",'
                 ' assuming VS2012. Your VS can probably upgrade')



Mime
View raw message