Author: rhuijben
Date: Mon Nov 2 20:01:59 2015
New Revision: 1712131
URL: http://svn.apache.org/viewvc?rev=1712131&view=rev
Log:
* SConstruct
Let scons generate the valid options.
Add the most likely next version of Visual Studio to the list.
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1712131&r1=1712130&r2=1712131&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Mon Nov 2 20:01:59 2015
@@ -130,7 +130,7 @@ if sys.platform == 'win32':
# Note that Scons 1.3 only supports this on Windows and only when
# constructing Environment(). Later changes to TARGET_ARCH are ignored
EnumVariable('TARGET_ARCH',
- "Platform to build for (x86|x64|win32|x86_64)",
+ "Platform to build for",
'x86',
allowed_values=('x86', 'x86_64', 'ia64'),
map={'X86' : 'x86',
@@ -141,11 +141,17 @@ if sys.platform == 'win32':
}),
EnumVariable('MSVC_VERSION',
- "Visual C++ to use for building (E.g. 11.0, 9.0)",
+ "Visual C++ to use for building",
None,
- allowed_values=('14.0', '12.0',
- '11.0', '10.0', '9.0', '8.0', '6.0')
- ),
+ allowed_values=('15.0', '14.0', '12.0',
+ '11.0', '10.0', '9.0', '8.0', '6.0'),
+ map={'2005' : '8.0',
+ '2008' : '9.0',
+ '2010' : '10.0',
+ '2012' : '11.0',
+ '2013' : '12.0',
+ '2015' : '14.0'
+ }),
# We always documented that we handle an install layout, but in fact we
# hardcoded source layouts. Allow disabling this behavior.
