[Jython-checkins] jython (merge 2.5 -> default): Merge with 2.5.
frank.wierzbicki
jython-checkins at python.org
Thu Feb 23 01:08:21 CET 2012
http://hg.python.org/jython/rev/facfa85de028
changeset: 6307:facfa85de028
parent: 6304:aba11643405e
parent: 6306:5fa0a5810b25
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Wed Feb 22 16:07:33 2012 -0800
summary:
Merge with 2.5.
files:
.hgtags | 1 +
NEWS | 2 +-
README.txt | 43 ++++-------------------------------------
build.xml | 39 +++++++++++++++++++++----------------
4 files changed, 29 insertions(+), 56 deletions(-)
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -57,3 +57,4 @@
98e52a9f6db0f795db1a17b3126039d75443f662 v2.5.2rc4
c72d5c5c968abac480c0841057797abf2d7f0018 v2.5.2
91332231a44804192e47ca25be334bab8ac8ea7c v2.5.2
+c5567b7757e7ff086bdb10006ddbd513a727a803 v2.5.3b1
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
Jython NEWS
-Jython 2.6a1
+Jython 2.5b1
Bugs Fixed
- [ 1835 ] s/occured/occurred/ :)
- [ 1727 ] Error in Jython 2.5.2 with os.stat and varargs
diff --git a/README.txt b/README.txt
--- a/README.txt
+++ b/README.txt
@@ -1,42 +1,9 @@
-Welcome to Jython 2.5.2
+Welcome to Jython 2.5.3b1
=======================
-This is the final 2.5.2 release of Jython.
-It contains the fixes of the blocker bugs since 2.5.2 release candidate 3.
+This is the first beta release of the 2.5.3 version of Jython
+Please see the NEWS file for detailed release notes.
-This release fixes bugs related to resource leaks, Java integration,
-and a number of other issues. See the NEWS file for more details. In
-particular, we did not completely fix #1327, "Classloaders cannot GC,
-which exhausts permgen." Jython uses instances of ThreadLocal-managed
-class, ThreadState, to manage its execution state, including frames,
-exceptions, and the global namespace. The ThreadState also indirectly
-refers to the ClassLoaders used by Jython. Such usage can cause
-resource leaks when a Jython application is restarted under certain
-app containers, because the ThreadState often may not cleaned up by
-the app server's thread pool.
+The release was compiled on Ubuntu with JDK 6 and requires JDK 5 to run.
-Fixing this problem without a backwards breaking API change appears
-to be difficult. Therefore we recommend exploring workarounds, such as
-the one published in this blog post,
-http://weblogs.java.net/blog/jjviana/archive/2010/06/09/dealing-glassfish-301-memory-leak-or-threadlocal-thread-pool-bad-ide
-
-Jython 2.6 will introduce limited backwards breaking API changes, so
-it will be possible to fully resolve this bug, and related issues, in
-that version instead.
-
-And -- last but not least -- please help spread the word:
-
-Organizations using Jython 2.2.1, or earlier, should test their code
-against 2.5.2 beta 2 now so that bug fixes and/or workarounds may be
-identified. In particular, please note the following:
-
- * No additional work is anticipated on Jython 2.2.
-
- * Jython 2.5.2 is the last release in Jython 2.5.x series that will
- address non-severe issues, including Java integration issues.
-
- * Jython 2.6 development will begin immediately following the 2.5.2
- release. Jython 2.6 will require the use of JDK 6.
-
-The release was compiled on Mac OS X with JDK 5 and requires JDK 5 to
-run. Please try it out and report any bugs at http://bugs.jython.org.
+Please try this out and report any bugs at http://bugs.jython.org.
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -52,9 +52,9 @@
oracle.jar=C:/workspace/HEAD/for_development/bisdevsrv28/jboss/server/infra/lib/ojdbc14.jar
#informix.jar=${basedir}/../externals/external-jars/ifxjdbc.jar
-# - option for javac (build.compiler=modern is a global option to use standard jdk 1.3/1.4/1.5)
+# - option for javac (build.compiler=modern is a global option to use standard jdk 1.5/1.6/1.7)
#build.compiler=modern
-#jdk.target.version=1.5
+#jdk.target.version=1.6
#debug=false
#deprecation=off
@@ -145,8 +145,8 @@
<os family="windows"/>
</condition>
<property name="build.compiler" value="modern" />
- <property name="jdk.target.version" value="1.5" />
- <property name="jdk.source.version" value="1.5" />
+ <property name="jdk.target.version" value="1.6" />
+ <property name="jdk.source.version" value="1.6" />
<property name="deprecation" value="true" />
<property name="debug" value="true" />
<property name="nowarn" value="false" />
@@ -242,7 +242,7 @@
<!-- predefined main directory for checkout -->
<property name="svn.main.dir" value="trunk" />
- <property name="svn.code.dir" value="jython" />
+ <property name="hg.code.dir" value="jython" />
<property name="svn.installer.dir" value="installer" />
<!-- predefined revision for checkout (this works for both trunk and release branches -->
<property name="svn.revision" value="HEAD" />
@@ -250,8 +250,8 @@
<!-- properties work.dir and jython.base.dir are also definied in init,
so full-preinit must run first to work -->
<property name="work.dir" value="${basedir}/../full_build/work" />
- <property name="svn.checkout.dir" value="${work.dir}/checkout" />
- <property name="jython.base.dir" value="${svn.checkout.dir}/${svn.code.dir}" />
+ <property name="checkout.dir" value="${work.dir}/checkout" />
+ <property name="jython.base.dir" value="${checkout.dir}/${hg.code.dir}" />
<!-- set has.repositories.connection to false in ant.properties if you want to skip checkout -->
<property name="has.repositories.connection" value="true" />
<condition property="do.checkout" value="true">
@@ -278,6 +278,8 @@
<echo>Build environment for ${ant.project.name}</echo>
<echo>(Note: if ${propertyname} is displayed, then the property is not set)</echo>
<echo>--- optional libraries ---</echo>
+ <echo>oracle location = '${oracle.jar}'</echo>
+ <echo>informix location = '${informix.jar}'</echo>
<echo>oracle = '${oracle.present}'</echo>
<echo>informix = '${informix.present}'</echo>
<echo>--- properties ---</echo>
@@ -301,7 +303,7 @@
<echo>--- properties (used for full-build only) ---</echo>
<echo>svn.main.dir = '${svn.main.dir}'</echo>
<echo>svn.revision = '${svn.revision}'</echo>
- <echo>svn.checkout.dir = '${svn.checkout.dir}'</echo>
+ <echo>checkout.dir = '${checkout.dir}'</echo>
<echo>javahl.dir = '${javahl.dir}'</echo>
<echo>svnant.jar.dir = '${svnant.jar.dir}'</echo>
<echo>do.snapshot.build = '${do.snapshot.build}'</echo>
@@ -345,10 +347,10 @@
</target>
- <!-- clean svn.checkout.dir if we really checkout -->
+ <!-- clean checkout.dir if we really checkout -->
<target name="clean-checkout-dir" if="do.checkout">
<delete includeemptydirs="true" failonerror="false">
- <fileset dir="${svn.checkout.dir}" includes="**/*" defaultexcludes="no" />
+ <fileset dir="${checkout.dir}" includes="**/*" defaultexcludes="no" />
</delete>
</target>
@@ -380,18 +382,21 @@
<!-- create checkout directory if necessary -->
<target name="prepare-checkout" if="do.checkout">
- <mkdir dir="${svn.checkout.dir}" />
+ <mkdir dir="${checkout.dir}" />
</target>
<target name="checkout" depends="prepare" if="do.checkout">
+ <exec executable="hg">
+ <arg line="clone http://hg.python.org/jython-releasing/2.5.3 -b 2.5 ${checkout.dir}/${hg.code.dir}"/>
+ </exec>
+
<svn javahl="${javahl.dir}" >
<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" />
- <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" />
</svn>
<!-- checkout cpython license from the correct python maintenance branch -->
<svn javahl="${javahl.dir}" >
- <checkout url="http://svn.python.org/projects/python/branches/release25-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+ <checkout url="http://svn.python.org/projects/python/branches/release26-maint/" destPath="${checkout.dir}/python" recurse="false" />
</svn>
</target>
@@ -451,7 +456,7 @@
<target name="brand-readme-version" depends="checkout" if="do.snapshot.build">
<!-- change README.txt version string, if so defined: used for
snapshot builds. XXX: a bit broken for now-->
- <replace file="${jython.base.dir}/README.txt" token='2.5a3+'
+ <replace file="${jython.base.dir}/README.txt" token='2.6a1+'
value='2.5a${svn.revision}' />
<replace file="${jython.base.dir}/README.txt">
<replacetoken>=======================</replacetoken>
@@ -721,14 +726,14 @@
windowtitle="Jython API documentation"
bottom="<a href='http://www.jython.org' target='_top'>Jython homepage</a>"
>
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
+ <link href="http://java.sun.com/j2se/1.6.0/docs/api/" />
<classpath refid="javadoc.classpath" />
</javadoc>
</target>
<target name="copy-license" if="do.checkout">
- <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
- <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+ <echo>copy CPython LICENSE from ${checkout.dir}/python</echo>
+ <copy file="${checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
</target>
<target name="copy-full" depends="copy-lib, copy-license" if="full-build">
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list