Skip to content

Commit fc2f465

Browse files
author
christian.heimes
committed
Issue #1706: Require Windows 2000+
Added Py_BUILD_CORE_MODULES macro to set WINVER and NTDDI_VERSION to Windows 2000 for core modules, too Added -d option to build.bat (same as -c Debug) and fixed warning about /build option Updated Windows related readme.txt files git-svn-id: http://svn.python.org/projects/python/trunk@60696 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent da8047f commit fc2f465

7 files changed

Lines changed: 35 additions & 20 deletions

File tree

‎Misc/NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1562,6 +1562,10 @@ C API
15621562
Windows
15631563
-------
15641564

1565+
- Patch #1706: Drop support for Win9x, WinME and NT4. Python now requires
1566+
Windows 2000 or greater. The _WINVER and NTDDI_VERSION macros are set to
1567+
Win2k for x86/32bit builds and WinXP for AMD64 builds.
1568+
15651569
- Conditionalize definition of _CRT_SECURE_NO_DEPRECATE
15661570
and _CRT_NONSTDC_NO_DEPRECATE.
15671571

‎PC/pyconfig.h‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,12 @@ WIN32 is still required for the locale module.
158158
/* set the version macros for the windows headers */
159159
#ifdef MS_WINX64
160160
/* 64 bit only runs on XP or greater */
161-
#define Py_WINVER 0x0501
161+
#define Py_WINVER _WIN32_WINNT_WINXP
162+
#define Py_NTDDI NTDDI_WINXP
162163
#else
163-
/* NT 4.0 or greater required otherwise */
164-
#define Py_WINVER 0x0400
164+
/* Python 2.6+ requires Windows 2000 or greater */
165+
#define Py_WINVER _WIN32_WINNT_WIN2K
166+
#define Py_NTDDI NTDDI_WIN2KSP4
165167
#endif
166168

167169
/* We only set these values when building Python - we don't want to force
@@ -171,7 +173,10 @@ WIN32 is still required for the locale module.
171173
structures etc so it can optionally use new Windows features if it
172174
determines at runtime they are available.
173175
*/
174-
#ifdef Py_BUILD_CORE
176+
#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
177+
#ifndef NTDDI_VERSION
178+
#define NTDDI_VERSION Py_NTDDI
179+
#endif
175180
#ifndef WINVER
176181
#define WINVER Py_WINVER
177182
#endif

‎PC/readme.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
Welcome to the "PC" subdirectory of the Python distribution
22
***********************************************************
33

4-
*** Note: the project files for MS VC++ 7.1 are now in the
5-
*** PCbuild directory. See the file readme.txt there for build
6-
*** instructions. There is some information below that might
7-
*** still be relevant.
8-
94
This "PC" subdirectory contains complete project files to make
105
several older PC ports of Python, as well as all the PC-specific
116
Python source files. It should be located in the root of the
@@ -79,18 +74,23 @@ dllbase_nt.txt A (manually maintained) list of base addresses for
7974
example_nt A subdirectory showing how to build an extension as a
8075
DLL.
8176

82-
Visual Studio 6.0
83-
=================
84-
The subdirectory VC6 contains Visual Studio 6 project files. These
85-
were originally located in the PCBuild directory, but are no longer
86-
maintained.
77+
Legacy support for older versions of Visual Studio
78+
==================================================
79+
The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older
80+
versions of Microsoft Visual Studio. See PCbuild/readme.txt.
81+
82+
EMX development tools for OS/2
83+
==============================
8784

85+
See os2emx/readme.txt. This platform is maintained by Andrew MacIntyre.
8886

8987
IBM VisualAge C/C++ for OS/2
9088
============================
9189

9290
See os2vacpp/readme.txt. This platform is supported by Jeff Rush.
9391

92+
NOTE: Support for os2vacpp may be dropped in the near future. Please move
93+
to EMX.
9494

9595
Note for Windows 3.x and DOS users
9696
==================================

‎PCbuild/build.bat‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ rem just for convenience.
55
setlocal
66
set platf=Win32
77
set conf=Release
8-
set build=/build
8+
set build=
99

1010
:CheckOpts
11-
if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
11+
if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
1212
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
13-
if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
13+
if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
14+
if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts
1415

1516
set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%"
1617
echo %cmd%

‎PCbuild/pyd.vsprops‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
>
88
<Tool
99
Name="VCCLCompilerTool"
10+
PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
1011
RuntimeLibrary="2"
1112
/>
1213
<Tool

‎PCbuild/pyd_d.vsprops‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
Optimization="0"
1111
InlineFunctionExpansion="0"
1212
EnableIntrinsicFunctions="false"
13+
PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
1314
RuntimeLibrary="3"
1415
/>
1516
<Tool

‎PCbuild/readme.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ folders or profile guided optimization (PGO). The missing bits and pieces
1919
won't stop you from building Python.
2020

2121
The solution is configured to build the projects in the correct order. "Build
22-
Solution" or F6 takes care of dependencies except for x64 builds. To make
22+
Solution" or F7 takes care of dependencies except for x64 builds. To make
2323
cross compiling x64 builds on a 32bit OS possible the x64 builds require a
2424
32bit version of Python.
2525

@@ -30,7 +30,8 @@ NOTE:
3030
running a Python core buildbot test slave; see SUBPROJECTS below)
3131

3232
When using the Debug setting, the output files have a _d added to
33-
their name: python30_d.dll, python_d.exe, parser_d.pyd, and so on.
33+
their name: python30_d.dll, python_d.exe, parser_d.pyd, and so on. Both
34+
the build and rt batch files accept a -d option for debug builds.
3435

3536
The 32bit builds end up in the solution folder PCbuild while the x64 builds
3637
land in the amd64 subfolder. The PGI and PGO builds for profile guided
@@ -122,6 +123,8 @@ _tkinter
122123

123124
Use x64 instead of Win32 for the x64 platform.
124125

126+
NOTE: Tcl/Tk 8.4 doesn't compile for x64.
127+
125128
Build Tcl first
126129
---------------
127130
Use "Start -> All Programs -> Microsoft Visual Studio 2008
@@ -285,7 +288,7 @@ Building for Itanium
285288

286289
NOTE:
287290
Official support for Itanium builds have been dropped from the build. Please
288-
contact as and provide patches if you are interested in Itanium builds.
291+
contact us and provide patches if you are interested in Itanium builds.
289292

290293
The project files support a ReleaseItanium configuration which creates
291294
Win64/Itanium binaries. For this to work, you need to install the Platform

0 commit comments

Comments
 (0)