Commits

Charlie Groves committed 923e3ab

Version bump for 2.2.1rc1

Comments (0)

Files changed (3)

-Welcome to Jython 2.2
+Welcome to Jython 2.2.1rc1
 =======================
-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
- - iterators
- - generators
- - __future__ division
- - support for running on modern JVMs
- - a new installer
- - ssl and non-blocking support for socket
-
-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.
+This is the first release candidate for the 2.2.1 release of Jython, an
+implementation of the Python programming language on the Java Virtual Machine.
+2.2.1 is a bugfix release that takes care of all of the major bugs that have
+been reported since 2.2.  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 an JVM
 with version 1.4.2 or later.
         <condition property="jython.version" value="${svn.revision}">
             <isset property="svn.revision" />
         </condition>
-        <property name="jython.version" value="2.2" />
+        <property name="jython.version" value="2.2.1rc1" />
     	<!-- if not set so far, default svn.revision to HEAD, since we always want
     	     the latest revision on the specified subversion main directory -->
     	<property name="svn.revision" value="HEAD"/>
 	     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.2"' value="${replace.value.version}" />
-		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0F" value="PY_RELEASE_LEVEL = 0xAA" />
+		<replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2.1rc1"' value="${replace.value.version}" />
+		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0C" 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 = 0" value="${replace.value.serial}" />
+		<replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_SERIAL = 1" value="${replace.value.serial}" />
 
     	<!-- change README.txt -->
 		<replace file="${jython.base.dir}/README.txt" token='2.2' value='2.2rc${svn.revision}' />

src/org/python/core/PySystemState.java

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