Commits

Anonymous committed 977fa13

Assorted changes needed to release 2.2.2b1.

Comments (0)

Files changed (5)

Include/patchlevel.h

 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	2
 #define PY_MICRO_VERSION	2
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL	0
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_BETA
+#define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION		"2.2.2a0"
+#define PY_VERSION		"2.2.2b1"
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
    Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
     2.1.2           2.1.1       2002        PSF         yes
     2.1.3           2.1.2       2002        PSF         yes
     2.2.1           2.2         2002        PSF         yes
+    2.2.2           2.2.1       2002        PSF         yes
 
 Footnotes:
 
 B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
 ===============================================================
 
-PSF LICENSE AGREEMENT FOR PYTHON 2.2.1
+PSF LICENSE AGREEMENT FOR PYTHON 2.2.2
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the Python Software Foundation
 ("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using Python 2.2.1 software in source or binary form and its
+otherwise using Python 2.2.2 software in source or binary form and its
 associated documentation.
 
 2. Subject to the terms and conditions of this License Agreement, PSF
 hereby grants Licensee a nonexclusive, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python 2.2.1
+prepare derivative works, distribute, and otherwise use Python 2.2.2
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
 2001, 2002 Python Software Foundation; All Rights Reserved" are
-retained in Python 2.2.1 alone or in any derivative version prepared
+retained in Python 2.2.2 alone or in any derivative version prepared
 by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 2.2.1 or any part thereof, and wants to make
+or incorporates Python 2.2.2 or any part thereof, and wants to make
 the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python 2.2.1.
+the changes made to Python 2.2.2.
 
-4. PSF is making Python 2.2.1 available to Licensee on an "AS IS"
+4. PSF is making Python 2.2.2 available to Licensee on an "AS IS"
 basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.2.1 WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.2.2 WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-2.2.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.2.1,
+2.2.2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.2.2,
 OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using Python 2.2.1, Licensee
+8. By copying, installing or otherwise using Python 2.2.2, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.
 

PCbuild/BUILDno.txt

 
 Windows Python BUILD numbers
 ----------------------------
+  36    2.2.2b1
+        7-Oct-2002
   34    2.2.1 (final)
         10-Apr-2002
   33    2.2.1c2

PCbuild/python20.wse

 Document Type: WSE
 item: Global
   Version=8.14
-  Title=Python 2.2.2a0
+  Title=Python 2.2.2b1
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=Python-2.2.2a0.exe
+  EXE Filename=Python-2.2.2b1.exe
   Dialogs Version=8
-  Version File=2.2.2a0
+  Version File=2.2.2b1
   Version Description=Python Programming Language
   Version Copyright=�2002 Python Software Foundation
   Version Company=PythonLabs at Zope Corporation
 end
 item: Set Variable
   Variable=PYVER_STRING
-  Value=2.2.2a0
+  Value=2.2.2b1
 end
 item: Remark
 end

PCbuild/pythoncore.dsp

 
 !IF  "$(CFG)" == "pythoncore - Win32 Release"
 
-# ADD CPP /D BUILD=34
+# ADD CPP /D BUILD=36
 
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
 
-# ADD CPP /D BUILD=34
+# ADD CPP /D BUILD=36
 
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"