Commits

Charlie Groves  committed 24b8ead

Version bump for 2.2

  • Participants
  • Parent commits ad4e5e8
  • Branches 2.2
  • Tags v2.2

Comments (0)

Files changed (4)

 Jython NEWS
 
+Jython 2.2
+  Identical to 2.2 rc3
 Jython 2.2 rc3
   New Features
     - Added telnetlib from CPython
-Welcome to Jython 2.2rc3
+Welcome to Jython 2.2
 =======================
-
-This is the third release candidate of the 2.2 version of Jython. It
-contains all of the new features for the 2.2 release:
+This is the 2.2 release of Jython, an implementation of the Python programming
+language on the Java Virtual Machine.  2.2 is the first stable
+release of Jython in nearly 6 years and is equivalent at a language level to
+the 2.2 release of Python.  It contains many major new features from 2.1:
  - new-style classes
  - Java List integration
  - a PEP 302 implementation
  - a new installer
  - ssl and non-blocking support for socket
 
-In addition to these major features, several bugs have been fixed from 2.2rc2.
+In addition to these features, many many bugs have been fixed in the meantime.
 See the NEWS file for a more complete list of changes.
 
-The release was compiled on Mac OS X with JDK 5 but it should run on
-1.4.2+.
+The release was compiled on Mac OS X with JDK 5 but it should run on an JVM
+with version 1.4.2 or later.
 
-This release is intended to find any major bugs before releasing 2.2.  If none
-are found, this will become the 2.2 release.  If you can run this and check for
-bugs, it will be greatly appreciated.  Bug reports can be created at
-http://jython.org/bugs whereas more general questions can be sent to the
-Jython-users mailing list, jython-users@lists.sourceforge.net.
-
-If this release proves stable, the final release of 2.2 will be in a couple
-weeks.  If not, successive release candidates will be made until all the major
-bugs are ironed out.
+Bug reports can be created at http://jython.org/bugs whereas more general
+questions can be sent to the Jython-users mailing list, 
+jython-users@lists.sourceforge.net.
         <property name="do.templates" value="true" />
 
         <!-- predefined tags for jython and cpython -->
-        <property name="svn.tag" value="Release_2_2rc3" />
+        <property name="svn.tag" value="Release_2_2" />
 
         <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" />
         <property name="svn.checkout.dir" value="${work.dir}/checkout" />
         <condition property="jython.version" value="${svn.revision}">
             <isset property="svn.revision" />
         </condition>
-        <property name="jython.version" value="2.2rc3" />
+        <property name="jython.version" value="2.2" />
 	<property name="svn.revision" value="HEAD"/>
     	
         <!-- classpath for svn ant task -->
 	     in PySystemState.java and README.txt change -->
 	<target name="version" depends="checkout" if="do.snapshot.build" >
 		<property name="replace.value.version" value='version = "2.2rc${svn.revision}"' />
-		<replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2rc3"' value="${replace.value.version}" />
-		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0C" value="PY_RELEASE_LEVEL = 0xAA" />
+		<replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2"' value="${replace.value.version}" />
+		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0F" value="PY_RELEASE_LEVEL = 0xAA" />
 		<property name="replace.value.serial" value="PY_RELEASE_SERIAL = ${svn.revision}" />
-		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_SERIAL = 3" value="${replace.value.serial}" />
+		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_SERIAL = 0" value="${replace.value.serial}" />
 
     	<!-- change README.txt -->
-		<replace file="${jython.base.dir}/README.txt" token='2.2rc3' value='2.2rc${svn.revision}' />
+		<replace file="${jython.base.dir}/README.txt" token='2.2' value='2.2rc${svn.revision}' />
 		<replace file="${jython.base.dir}/README.txt">
 			<replacetoken>=======================</replacetoken>
 			<replacevalue>--------------------------

File src/org/python/core/PySystemState.java

      * <p>
      * This also applies for the <code>PY_*</code> integer values below
      */
-    public static String version = "2.2rc3";
+    public static String version = "2.2";
 
     private static int PY_MAJOR_VERSION = 2;
     private static int PY_MINOR_VERSION = 2;
     private static int PY_MICRO_VERSION = 0;
-    private static int PY_RELEASE_LEVEL = 0x0C;
-    private static int PY_RELEASE_SERIAL = 3;
+    private static int PY_RELEASE_LEVEL = 0x0F;
+    private static int PY_RELEASE_SERIAL = 0;
 
     public static int hexversion = ((PY_MAJOR_VERSION << 24) |
                                     (PY_MINOR_VERSION << 16) |