subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1870902 - in /subversion/branches/1.11.x: ./ STATUS build/generator/gen_win_dependencies.py
Date Fri, 06 Dec 2019 04:00:43 GMT
Author: svn-role
Date: Fri Dec  6 04:00:43 2019
New Revision: 1870902

URL: http://svn.apache.org/viewvc?rev=1870902&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, jamessan

Modified:
    subversion/branches/1.11.x/   (props changed)
    subversion/branches/1.11.x/STATUS
    subversion/branches/1.11.x/build/generator/gen_win_dependencies.py

Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1856397

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1870902&r1=1870901&r2=1870902&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Fri Dec  6 04:00:43 2019
@@ -31,10 +31,3 @@ 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, jamessan

Modified: subversion/branches/1.11.x/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/build/generator/gen_win_dependencies.py?rev=1870902&r1=1870901&r2=1870902&view=diff
==============================================================================
--- subversion/branches/1.11.x/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/1.11.x/build/generator/gen_win_dependencies.py Fri Dec  6 04:00:43
2019
@@ -265,6 +265,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