You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/03/19 19:23:52 UTC
svn commit: r1667835 - in /subversion/branches/1.9.x: ./ STATUS
build/generator/gen_win_dependencies.py gen-make.py
subversion/libsvn_subr/utf8proc/utf8proc.h
Author: svn-role
Date: Thu Mar 19 18:23:52 2015
New Revision: 1667835
URL: http://svn.apache.org/r1667835
Log:
Merge the r1663183 group from trunk:
* r1663183, r1663184
Introduce build support for Visual Studio "2015"
Justification:
Unbreaks building with the VS version that should be released somewhere
later this year.
Notes:
Includes a few generator fixes, and compilation fixes of utf8proc.c.
Votes:
+1: rhuijben, brane, stefan2
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/build/generator/gen_win_dependencies.py
subversion/branches/1.9.x/gen-make.py
subversion/branches/1.9.x/subversion/libsvn_subr/utf8proc/utf8proc.h
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 19 18:23:52 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663374,1663450,1663697,1663706,1663749,1664078,1664080,1664084-1664085,1664187,1664191,1664200,1664344,1664476,1664480-1664481,1664483,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664927,1665164,1665611-1665612,1665845,1665850,1665852,1665886,1666270,1666272,1666690,1666851
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1667835&r1=1667834&r2=1667835&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Thu Mar 19 18:23:52 2015
@@ -178,16 +178,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1663183, r1663184
- Introduce build support for Visual Studio "2015"
- Justification:
- Unbreaks building with the VS version that should be released somewhere
- later this year.
- Notes:
- Includes a few generator fixes, and compilation fixes of utf8proc.c.
- Votes:
- +1: rhuijben, brane, stefan2
-
* r1663791
Trivial typo fix in error message.
Justification:
Modified: subversion/branches/1.9.x/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/build/generator/gen_win_dependencies.py?rev=1667835&r1=1667834&r2=1667835&view=diff
==============================================================================
--- subversion/branches/1.9.x/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/1.9.x/build/generator/gen_win_dependencies.py Thu Mar 19 18:23:52 2015
@@ -253,6 +253,18 @@ class GenDependenciesBase(gen_base.Gener
self.sln_version = '12.00'
self.vcproj_version = '12.0'
self.vcproj_extension = '.vcxproj'
+ elif val == '2015' or val == '14':
+ self.vs_version = '2015'
+ self.sln_version = '12.00'
+ self.vcproj_version = '14.0'
+ self.vcproj_extension = '.vcxproj'
+ elif re.match('^20\d+$', val):
+ print('WARNING: Unknown VS.NET version "%s",'
+ ' assuming VS2012. Your VS can probably upgrade')
+ self.vs_version = '2012'
+ self.sln_version = '12.00'
+ self.vcproj_version = '11.0'
+ self.vcproj_extension = '.vcxproj'
elif re.match('^1\d+$', val):
self.vs_version = val
self.sln_version = '12.00'
Modified: subversion/branches/1.9.x/gen-make.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/gen-make.py?rev=1667835&r1=1667834&r2=1667835&view=diff
==============================================================================
--- subversion/branches/1.9.x/gen-make.py (original)
+++ subversion/branches/1.9.x/gen-make.py Thu Mar 19 18:23:52 2015
@@ -206,7 +206,7 @@ def _usage_exit(err=None):
print("")
print(" --vsnet-version=VER")
print(" generate for VS.NET version VER (2002, 2003, 2005, 2008,")
- print(" 2010, 2012 or 2013)")
+ print(" 2010, 2012, 2013 or 2015)")
print(" [only valid in combination with '-t vcproj']")
print("")
print(" -D NAME[=value]")
Modified: subversion/branches/1.9.x/subversion/libsvn_subr/utf8proc/utf8proc.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_subr/utf8proc/utf8proc.h?rev=1667835&r1=1667834&r2=1667835&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_subr/utf8proc/utf8proc.h (original)
+++ subversion/branches/1.9.x/subversion/libsvn_subr/utf8proc/utf8proc.h Thu Mar 19 18:23:52 2015
@@ -71,18 +71,23 @@
#include <stdlib.h>
#include <sys/types.h>
#ifdef _MSC_VER
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef int int32_t;
-#ifdef _WIN64
-#define ssize_t __int64
-#else
-#define ssize_t int
-#endif
-typedef unsigned char bool;
-enum {false, true};
+# if _MSC_VER >= 1900
+# include <stdbool.h>
+# include <stdint.h>
+# else
+ typedef signed char int8_t;
+ typedef unsigned char uint8_t;
+ typedef short int16_t;
+ typedef unsigned short uint16_t;
+ typedef int int32_t;
+ typedef unsigned char bool;
+ enum {false, true};
+# endif
+# ifdef _WIN64
+# define ssize_t __int64
+# else
+# define ssize_t int
+# endif
#elif defined(HAVE_STDBOOL_H) && defined(HAVE_INTTYPES_H)
#include <stdbool.h>
#include <inttypes.h>