You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@serf.apache.org by ko...@apache.org on 2023/05/18 09:27:46 UTC
svn commit: r1909900 - in /serf/branches/1.3.x: ./ SConstruct STATUS
Author: kotkov
Date: Thu May 18 09:27:46 2023
New Revision: 1909900
URL: http://svn.apache.org/viewvc?rev=1909900&view=rev
Log:
On '1.3.x' branch: Merge the r1712131 group from trunk:
* r1712131, r1807594, r1811088, r1861036, r1909315, r1909316
Add support for building with VS2017-VS2022, assuming a new enough scons.
Votes:
+1: kotkov, ivan
+1: rhuijben (without r1861036, r1909315, r1909316)
+1: astieger (without r1861036, r1909315, r1909316)
+1 (non-binding): dsahlberg (only tested r1909316 on VS 2022 but the
rest seems fine and are anyhow obsolete by now)
Modified:
serf/branches/1.3.x/ (props changed)
serf/branches/1.3.x/SConstruct
serf/branches/1.3.x/STATUS
Propchange: serf/branches/1.3.x/
------------------------------------------------------------------------------
Merged /serf/trunk:r1712131,1807594,1811088,1861036,1909315-1909316
Modified: serf/branches/1.3.x/SConstruct
URL: http://svn.apache.org/viewvc/serf/branches/1.3.x/SConstruct?rev=1909900&r1=1909899&r2=1909900&view=diff
==============================================================================
--- serf/branches/1.3.x/SConstruct (original)
+++ serf/branches/1.3.x/SConstruct Thu May 18 09:27:46 2023
@@ -127,7 +127,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',
@@ -138,11 +138,20 @@ 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=('14.3', '14.2', '14.1', '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',
+ '2017' : '14.1',
+ '2019' : '14.2',
+ '2022' : '14.3',
+ }),
# We always documented that we handle an install layout, but in fact we
# hardcoded source layouts. Allow disabling this behavior.
Modified: serf/branches/1.3.x/STATUS
URL: http://svn.apache.org/viewvc/serf/branches/1.3.x/STATUS?rev=1909900&r1=1909899&r2=1909900&view=diff
==============================================================================
--- serf/branches/1.3.x/STATUS (original)
+++ serf/branches/1.3.x/STATUS Thu May 18 09:27:46 2023
@@ -35,15 +35,6 @@ Candidate changes:
this point for the 1.3.x branch
- Seems to only be required for LibreSSL, not OpenSSL)
- * r1712131, r1807594, r1811088, r1861036, r1909315, r1909316
- Add support for building with VS2017-VS2022, assuming a new enough scons.
- Votes:
- +1: kotkov, ivan
- +1: rhuijben (without r1861036, r1909315, r1909316)
- +1: astieger (without r1861036, r1909315, r1909316)
- +1 (non-binding): dsahlberg (only tested r1909316 on VS 2022 but the
- rest seems fine and are anyhow obsolete by now)
-
* r1901040
Fix test_ssl_handshake() failure with OpenSSL 1.1.1i+.
Justification: