Update the example Windows extension to 2.2 (was hardcoded to 2.1).

diff --git a/PC/example_nt/example.dsp b/PC/example_nt/example.dsp
index 5d806188f5c8d68378be2c37aafd14569f363012..13ae887be1ef389603b461434fcc32a16b4942bd 100644 (file)
--- a/PC/example_nt/example.dsp
+++ b/PC/example_nt/example.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python21.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\PCbuild" /export:initexample\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\PCbuild" /export:initexample\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "example - Win32 Debug"\r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python21_d.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug/example_d.dll" /libpath:"..\PCbuild" /export:initexample\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22_d.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:".\Debug/example_d.dll" /libpath:"..\PCbuild" /export:initexample\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PC/example_nt/readme.txt b/PC/example_nt/readme.txt
index 426ac710783fbb092ba952eaa4483b673827b7a4..aa2b3091909343434f3fc77d1b4ae6b1dcbd9665 100644 (file)
--- a/PC/example_nt/readme.txt
+++ b/PC/example_nt/readme.txt
@@ -4,7 +4,7 @@ Example Python extension for Windows NT
 This directory contains everything needed (except for the Python\r
 distribution!) to build a Python extension module using Microsoft VC++\r
 ("Developer Studio") version 6.  It has been tested with VC++ 6.0 on Python\r
-2.1a1.  You can also use earlier versions of VC to build Python extensions,\r
+2.2c1.  You can also use earlier versions of VC to build Python extensions,\r
 but the sample VC project file (example.dsw in this directory) is in VC 6\r
 format.\r
 \r
@@ -54,13 +54,13 @@ debug output from Python may not match this screen dump exactly):
     C>..\..\PCbuild\python_d\r
     Adding parser accelerators ...\r
     Done.\r
-    Python 2.1a1 (#9, Jan 17 2001, 23:26:37) [MSC 32 bit (Intel)] on win32\r
-    Type "copyright", "credits" or "license" for more information.\r
+    Python 2.2c1+ (#28, Dec 14 2001, 18:06:39) [MSC 32 bit (Intel)] on win32\r
+    Type "help", "copyright", "credits" or "license" for more information.\r
     >>> import example\r
-    [4897 refs]\r
+    [7052 refs]\r
     >>> example.foo()\r
     Hello, world\r
-    [4903 refs]\r
+    [7052 refs]\r
     >>>\r
 \r
 TESTING THE RELEASE-MODE DLL\r
@@ -70,8 +70,8 @@ example_nt\Release.  You should now be able to repeat the following session
 ("C>" is the DOS prompt, ">>>" is the Python prompt):\r
 \r
     C>..\..\PCbuild\python\r
-    Python 2.1a1 (#9, Jan 17 2001, 23:26:37) [MSC 32 bit (Intel)] on win32\r
-    Type "copyright", "credits" or "license" for more information.\r
+    Python 2.2c1+ (#28, Dec 14 2001, 18:06:04) [MSC 32 bit (Intel)] on win32\r
+    Type "help", "copyright", "credits" or "license" for more information.\r
     >>> import example\r
     >>> example.foo()\r
     Hello, world\r
@@ -144,11 +144,11 @@ in the "Additional library path:" box.
 Now you need to add some mode-specific settings:\r
 \r
 Select "Win32 Release" in the "Settings for:" dropdown list.  Click the\r
-"Link" tab, choose the "Input" Category, and append "python21.lib" to the\r
+"Link" tab, choose the "Input" Category, and append "python22.lib" to the\r
 list in the "Object/library modules:" box.\r
 \r
 Select "Win32 Debug" in the "Settings for:" dropdown list, and append\r
-"python21_d.lib" to the list in the "Object/library modules:" box.  Then\r
+"python22_d.lib" to the list in the "Object/library modules:" box.  Then\r
 click on the C/C++ tab, select "Code Generation" from the "Category:"\r
 dropdown list, and select "Debug Multithreaded DLL" from the "Use run-time\r
 library:" dropdown list.\r