Windows build: close out 2.2, prep for 2.3.

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 20792ac812f5c80102ad83f725986e19f914ca5a..6402f1d7b0be1973d3094f8990928621c8c4e3de 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -333,9 +333,9 @@ typedef int pid_t;
    more (other compilers will still need to do so, but that's taken care
    of by the Distutils, so it's not a problem). */
 #ifdef _DEBUG
-#pragma comment(lib,"python22_d.lib")
+#pragma comment(lib,"python23_d.lib")
 #else
-#pragma comment(lib,"python22.lib")
+#pragma comment(lib,"python23.lib")
 #endif
 #endif /* USE_DL_EXPORT */
 

diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index e90f4c7c814917090a765dbe76081df2f7f85900..877899853a64dd065abaff8e0be5963863c877ef 100644 (file)
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -13,7 +13,7 @@
  *    PYTHON_DLL_NAME ditto.
  * MS_DLL_ID must match PY_VERSION in the Windows install script.
  */
-#define MS_DLL_ID "2.2"
+#define MS_DLL_ID "2.3"
 
 #ifndef PYTHON_DLL_NAME
 #define PYTHON_DLL_NAME "python22.dll"
@@ -73,7 +73,7 @@ BEGIN
             VALUE "FileDescription", "Python Core\0"
             VALUE "FileVersion", PYTHON_VERSION
             VALUE "InternalName", "Python DLL\0"
-            VALUE "LegalCopyright", "Copyright © 2001 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
+            VALUE "LegalCopyright", "Copyright © 2001-2002 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
             VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
             VALUE "ProductName", "Python\0"
             VALUE "ProductVersion", PYTHON_VERSION

diff --git a/PCbuild/BUILDno.txt b/PCbuild/BUILDno.txt
index 37937ab8ed7d31077bea4527a0f2641b5985e53c..148924d576b8ff87456ec99d800f334db77abdad 100644 (file)
--- a/PCbuild/BUILDno.txt
+++ b/PCbuild/BUILDno.txt
@@ -33,8 +33,10 @@ How to change the Windows build number:
 
 Windows Python BUILD numbers
 ----------------------------
+  29    CVS development
+        21-Dec-2001
   28    2.2 final
-        21-Dec-2001  TENTATIVE
+        21-Dec-2001
   27    2.2c1
         14-Dec-2001
   26    2.2b2

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 7b813275b7b75721350a4afd2cefbee856670a3a..0932e65ed504f3a99547a3643f9f08d1b13dd853 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=8.14
-  Title=Python 2.2
+  Title=Python 2.3 alpha 1
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -18,14 +18,14 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=Python-2.2.exe
+  EXE Filename=Python-2.3a1.exe
   Dialogs Version=8
-  Version File=2.2
+  Version File=2.3a1
   Version Description=Python Programming Language
   Version Copyright=©2001 Python Software Foundation
   Version Company=PythonLabs at Zope Corporation
   Crystal Format=10111100101100000010001001001001
-  Step View=&All
+  Step View=&Properties
   Variable Name1=_WISE_
   Variable Description1=WISE root directory
   Variable Default1=C:\PROGRAM FILES\WISE INSTALLMASTER 8.1
@@ -50,7 +50,7 @@ item: Global
   Variable Flags5=00001000
   Variable Name6=_PYMINOR_
   Variable Description6=Python minor version number; the 3 in 2.3
-  Variable Default6=2
+  Variable Default6=3
   Variable Flags6=00001000
   Variable Name7=_DOADMIN_
   Variable Description7=The initial value for %DOADMIN%.
@@ -64,7 +64,7 @@ item: Global
 end
 item: Set Variable
   Variable=PYVER_STRING
-  Value=2.2
+  Value=2.3a1
 end
 item: Remark
 end

diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp
index 4cd633048a54277ed1520f04f15b324ce9b95b2a..6495952c203052e6336aca56caf2b4949564b0f3 100644 (file)
--- a/PCbuild/pythoncore.dsp
+++ b/PCbuild/pythoncore.dsp
@@ -57,7 +57,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 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python22.dll"\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python23.dll"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"\r
@@ -88,7 +88,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 /pdbtype:sept\r
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python22_d.dll" /pdbtype:sept\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python23_d.dll" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"\r
@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python22_d.dll" /pdbtype:sept\r
+# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python23_d.dll" /pdbtype:sept\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python22_d.dll" /pdbtype:sept\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python23_d.dll" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"\r
@@ -739,11 +739,11 @@ SOURCE=..\Modules\getbuildinfo.c
 \r
 !IF  "$(CFG)" == "pythoncore - Win32 Release"\r
 \r
-# ADD CPP /D BUILD=28\r
+# ADD CPP /D BUILD=29\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"\r
 \r
-# ADD CPP /D BUILD=28\r
+# ADD CPP /D BUILD=29\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"\r
 \r