Issue #19391: Clean up PCbuild/readme.txt

PCbuild/readme.txt

@@ -2,7 +2,7 @@ Building Python using VC++ 10.0
 -------------------------------
 
 This directory is used to build Python for Win32 and x64 platforms, e.g.
-Windows 2000, XP, Vista and Windows Server 2008.  In order to build 32-bit
+Windows XP, Vista and Windows Server 2008.  In order to build 32-bit
 debug and release executables, Microsoft Visual C++ 2010 Express Edition is
 required at the very least.  In order to build 64-bit debug and release
 executables, Visual Studio 2010 Standard Edition is required at the very
@@ -64,10 +64,10 @@ PC/VS9.0/
 C RUNTIME
 ---------
 
-Visual Studio 2010 uses version 10 of the C runtime (MSVCRT9).  The executables
+Visual Studio 2010 uses version 10 of the C runtime (MSVCRT10).  The executables
 no longer use the "Side by Side" assemblies used in previous versions of the
 compiler.  This simplifies distribution of applications.
-The run time libraries are avalible under the VC/Redist folder of your visual studio
+The run time libraries are available under the VC/Redist folder of your visual studio
 distribution. For more info, see the Readme in the VC/Redist folder.
 
 SUBPROJECTS
@@ -103,10 +103,10 @@ winsound
 
 Python-controlled subprojects that wrap external projects:
 _sqlite3
-    Wraps SQLite 3.7.4, which is currently built by sqlite3.vcproj (see below).
+    Wraps SQLite 3.7.12, which is currently built by sqlite3.vcxproj.
 _tkinter
     Wraps the Tk windowing system.  Unlike _sqlite3, there's no
-    corresponding tcltk.vcproj-type project that builds Tcl/Tk from vcproj's
+    corresponding tcltk.vcxproj-type project that builds Tcl/Tk from vcxproj's
     within our pcbuild.sln, which means this module expects to find a
     pre-built Tcl/Tk in either ..\..\tcltk for 32-bit or ..\..\tcltk64 for
     64-bit (relative to this directory).  See below for instructions to build
@@ -122,16 +122,6 @@ _bz2
     ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
     obtaining external sources then you don't need to manually get the source
     above via subversion. **
-
-    A custom pre-link step in the bz2 project settings should manage to
-    build bzip2-1.0.6\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
-    linked in PCbuild\.
-    However, the bz2 project is not smart enough to remove anything under
-    bzip2-1.0.6\ when you do a clean, so if you want to rebuild bzip2.lib
-    you need to clean up bzip2-1.0.6\ by hand.
-
-    All of this managed to build libbz2.lib in 
-    bzip2-1.0.6\$platform-$configuration\, which the Python project links in.
 _lzma
     Python wrapper for the liblzma compression library.
 
@@ -156,12 +146,10 @@ _ssl
 
     You must install the NASM assembler 2.10 or newer from
         http://nasm.sf.net
-    for x86 builds.  Put nasmw.exe anywhere in your PATH. More recent
+    for x86 builds.  Put nasm.exe anywhere in your PATH. More recent
     versions of OpenSSL may need a later version of NASM. If OpenSSL's self
     tests don't pass, you should first try to update NASM and do a full
     rebuild of OpenSSL.
-    Note: recent releases of nasm only have nasm.exe. Just rename it to 
-    nasmw.exe.
 
     You can also install ActivePerl from
         http://www.activestate.com/activeperl/
@@ -209,18 +197,18 @@ though, take a look at the relevant external(-amd64).bat file and find the
 two nmake lines, then call each one without the 'DEBUG=1' parameter, i.e.:
 
 The external-amd64.bat file contains this for tcl:
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
+    nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
 
 So for a release build, you'd call it as:
-    nmake -f makefile.vc COMPILERFLAGS=-DWINVER=0x0500 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
+    nmake -f makefile.vc MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all install
 
     XXX Should we compile with OPTS=threads?
     XXX Our installer copies a lot of stuff out of the Tcl/Tk install
     XXX directory.  Is all of that really needed for Python use of Tcl/Tk?
 
 This will be cleaned up in the future; ideally Tcl/Tk will be brought into our
-pcbuild.sln as custom .vcproj files, just as we've recently done with the
-sqlite3.vcproj file, which will remove the need for Tcl/Tk to be built
+pcbuild.sln as custom .vcxproj files, just as we've recently done with the
+sqlite3.vcxproj file, which will remove the need for Tcl/Tk to be built
 separately via a batch file.
 
 XXX trent.nelson 02-Apr-08:
@@ -256,19 +244,9 @@ XXX trent.nelson 02-Apr-08:
 Building for Itanium
 --------------------
 
-NOTE:
 Official support for Itanium builds have been dropped from the build. Please
 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
-SDK, in particular the 64-bit support. This includes an Itanium compiler
-(future releases of the SDK likely include an AMD64 compiler as well).
-In addition, you need the Visual Studio plugin for external C compilers,
-from http://sf.net/projects/vsextcomp. The plugin will wrap cl.exe, to
-locate the proper target compiler, and convert compiler options
-accordingly. The project files require at least version 0.9.
-
 Building for AMD64
 ------------------
 
@@ -288,7 +266,7 @@ Profile Guided Optimization
 
 The solution has two configurations for PGO. The PGInstrument
 configuration must be build first. The PGInstrument binaries are
-lniked against a profiling library and contain extra debug
+linked against a profiling library and contain extra debug
 information. The PGUpdate configuration takes the profiling data and
 generates optimized binaries.
 
@@ -296,7 +274,7 @@ The build_pgo.bat script automates the creation of optimized binaries. It
 creates the PGI files, runs the unit test suite or PyBench with the PGI
 python and finally creates the optimized files.
 
-http://msdn2.microsoft.com/en-us/library/e7k32f4k(VS.90).aspx
+http://msdn.microsoft.com/en-us/library/e7k32f4k(VS.100).aspx
 
 Static library
 --------------
@@ -312,7 +290,7 @@ Visual Studio properties
 ------------------------
 
 The PCbuild solution makes heavy use of Visual Studio property files
-(*.vsprops). The properties can be viewed and altered in the Property
+(*.props). The properties can be viewed and altered in the Property
 Manager (View -> Other Windows -> Property Manager).
 
  * debug (debug macro: _DEBUG)