From a8223149e14bed011d604edb20f17f6d5d3b08cd Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sat, 9 Feb 2008 20:58:00 +0000 Subject: [PATCH] Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60696-60698 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r60696 | christian.heimes | 2008-02-09 20:55:22 +0100 (Sat, 09 Feb 2008) | 5 lines 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 ........ --- PC/pyconfig.h | 13 +++++++++---- PC/readme.txt | 20 ++++++++++---------- PCbuild/build.bat | 7 ++++--- PCbuild/pyd.vsprops | 1 + PCbuild/pyd_d.vsprops | 1 + PCbuild/readme.txt | 9 ++++++--- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/PC/pyconfig.h b/PC/pyconfig.h index eb92b4115de..53645a7b740 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -158,10 +158,12 @@ WIN32 is still required for the locale module. /* set the version macros for the windows headers */ #ifdef MS_WINX64 /* 64 bit only runs on XP or greater */ -#define Py_WINVER 0x0501 +#define Py_WINVER _WIN32_WINNT_WINXP +#define Py_NTDDI NTDDI_WINXP #else -/* NT 4.0 or greater required otherwise */ -#define Py_WINVER 0x0400 +/* Python 2.6+ requires Windows 2000 or greater */ +#define Py_WINVER _WIN32_WINNT_WIN2K +#define Py_NTDDI NTDDI_WIN2KSP4 #endif /* 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. structures etc so it can optionally use new Windows features if it determines at runtime they are available. */ -#ifdef Py_BUILD_CORE +#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE) +#ifndef NTDDI_VERSION +#define NTDDI_VERSION Py_NTDDI +#endif #ifndef WINVER #define WINVER Py_WINVER #endif diff --git a/PC/readme.txt b/PC/readme.txt index f1db9d37670..b5a5a871186 100644 --- a/PC/readme.txt +++ b/PC/readme.txt @@ -1,11 +1,6 @@ Welcome to the "PC" subdirectory of the Python distribution *********************************************************** -*** Note: the project files for MS VC++ 7.1 are now in the -*** PCbuild directory. See the file readme.txt there for build -*** instructions. There is some information below that might -*** still be relevant. - This "PC" subdirectory contains complete project files to make several older PC ports of Python, as well as all the PC-specific 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 example_nt A subdirectory showing how to build an extension as a DLL. -Visual Studio 6.0 -================= -The subdirectory VC6 contains Visual Studio 6 project files. These -were originally located in the PCBuild directory, but are no longer -maintained. +Legacy support for older versions of Visual Studio +================================================== +The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older +versions of Microsoft Visual Studio. See PCbuild/readme.txt. +EMX development tools for OS/2 +============================== + +See os2emx/readme.txt. This platform is maintained by Andrew MacIntyre. IBM VisualAge C/C++ for OS/2 ============================ See os2vacpp/readme.txt. This platform is supported by Jeff Rush. +NOTE: Support for os2vacpp may be dropped in the near future. Please move + to EMX. Note for Windows 3.x and DOS users ================================== diff --git a/PCbuild/build.bat b/PCbuild/build.bat index d181daf802b..a73560ebbff 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -5,12 +5,13 @@ rem just for convenience. setlocal set platf=Win32 set conf=Release -set build=/build +set build= :CheckOpts -if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts +if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts -if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts +if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts +if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%" echo %cmd% diff --git a/PCbuild/pyd.vsprops b/PCbuild/pyd.vsprops index 2e21a8068a2..726cebd1b00 100644 --- a/PCbuild/pyd.vsprops +++ b/PCbuild/pyd.vsprops @@ -7,6 +7,7 @@ > All Programs -> Microsoft Visual Studio 2008 @@ -285,7 +288,7 @@ Building for Itanium NOTE: Official support for Itanium builds have been dropped from the build. Please -contact as and provide patches if you are interested in Itanium builds. +contact us and provide patches if you are interested in Itanium builds. The project files support a ReleaseItanium configuration which creates Win64/Itanium binaries. For this to work, you need to install the Platform