svn commit: r1533907 - in /subversion/trunk: build/generator/gen_win_dependencies.py gen-make.py

[rh...@apache.org]

Author: rhuijben
Date: Sun Oct 20 14:07:35 2013
New Revision: 1533907

URL: http://svn.apache.org/r1533907
Log:
Support Visual Studio 2013 as '2013' in the Windows build.
(It was already possible to use the option '12' to create a working
 but sub-optimal solution)

* gen-make.py
  Document VS 2013 value.
  
* build/generator/gen_win_dependencies.py
  (parse_options): Set internal versions for VS 2013.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py
    subversion/trunk/gen-make.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1533907&r1=1533906&r2=1533907&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sun Oct 20 14:07:35 2013
@@ -252,9 +252,19 @@ class GenDependenciesBase(gen_base.Gener
           self.sln_version = '12.00'
           self.vcproj_version = '11.0'
           self.vcproj_extension = '.vcxproj'
+        elif val == '2012' or val == '11':
+          self.vs_version = '2012'
+          self.sln_version = '12.00'
+          self.vcproj_version = '11.0'
+          self.vcproj_extension = '.vcxproj'
+        elif val == '2013' or val == '12':
+          self.vs_version = '2013'
+          self.sln_version = '13.00'
+          self.vcproj_version = '12.0'
+          self.vcproj_extension = '.vcxproj'          
         elif re.match('^1\d+$', val):
           self.vsversion = val
-          self.sln_version = '12.00'
+          self.sln_version = val + '.00'
           self.vcproj_version = val + '.0'
           self.vcproj_extension = '.vcxproj'
         else:

Modified: subversion/trunk/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/gen-make.py?rev=1533907&r1=1533906&r2=1533907&view=diff
==============================================================================
--- subversion/trunk/gen-make.py (original)
+++ subversion/trunk/gen-make.py Sun Oct 20 14:07:35 2013
@@ -209,7 +209,8 @@ def _usage_exit(err=None):
   print("           Use static openssl")
   print("")
   print("  --vsnet-version=VER")
-  print("           generate for VS.NET version VER (2002, 2003, 2005, 2008, 2010 or 2012)")
+  print("           generate for VS.NET version VER (2002, 2003, 2005, 2008,")
+  print("           2010, 2012 or 2013)")
   print("           [only valid in combination with '-t vcproj']")
   print("")
   print("  --with-apr_memcache=DIR")