Menu
▾
▴
jython-checkins
|
From: <otm...@us...> - 2009-03-03 22:54:14
|
Revision: 6065
http://jython.svn.sourceforge.net/jython/?rev=6065&view=rev
Author: otmarhumbel
Date: 2009-03-03 22:54:05 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
use the correct name of the new antlr 3.1.2 runtime .jar in /extlibs
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-03-03 15:54:04 UTC (rev 6064)
+++ trunk/jython/build.xml 2009-03-03 22:54:05 UTC (rev 6065)
@@ -539,7 +539,7 @@
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
<jarjar destfile="${dist.dir}/${jython.deploy.jar}">
<zipfileset src="${dist.dir}/${jython.dev.jar}"/>
- <zipfileset src="extlibs/antlr-3.1.2-runtime.jar"/>
+ <zipfileset src="extlibs/antlr-runtime-3.1.2.jar"/>
<rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
<zipfileset src="extlibs/asm-3.1.jar"/>
<zipfileset src="extlibs/asm-commons-3.1.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2009-04-05 18:42:29
|
Revision: 6166
http://jython.svn.sourceforge.net/jython/?rev=6166&view=rev
Author: pjenvey
Date: 2009-04-05 18:42:28 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
fix ant javatest regrtest (the buildbot) unnecessarily compiling twice
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-04-05 18:29:58 UTC (rev 6165)
+++ trunk/jython/build.xml 2009-04-05 18:42:28 UTC (rev 6166)
@@ -504,6 +504,8 @@
<include name="**/*.properties" />
</fileset>
</copy>
+ <!-- grammar must now be up to date -->
+ <property name="antlr.notneeded" value="true" />
</target>
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <otm...@us...> - 2009-04-22 21:13:36
|
Revision: 6253
http://jython.svn.sourceforge.net/jython/?rev=6253&view=rev
Author: otmarhumbel
Date: 2009-04-22 21:13:26 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
developer-build: copy the registry file to the local dist directory
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-04-22 03:03:00 UTC (rev 6252)
+++ trunk/jython/build.xml 2009-04-22 21:13:26 UTC (rev 6253)
@@ -632,7 +632,7 @@
<target name="copy-full" depends="copy-lib, copy-license" if="full-build">
<echo>copy misc files from ${jython.base.dir}</echo>
- <copy todir="${dist.dir}" preservelastmodified="true">
+ <copy todir="${dist.dir}" preservelastmodified="true" overwrite="true">
<fileset dir="${jython.base.dir}"
includes="ACKNOWLEDGMENTS, build.xml, build.Lib.include.properties, NEWS, LICENSE.txt, README.txt, registry"
/>
@@ -692,14 +692,16 @@
</fileset>
</copy>
+ <!-- copy the shell scripts and make them executable -->
<copy todir="${dist.dir}/bin">
<fileset dir="${source.dir}/shell"/>
</copy>
-
<chmod perm="ugo+rx">
<fileset dir="${dist.dir}/bin" />
</chmod>
+ <!-- copy the registry -->
+ <copy todir="${dist.dir}" file="${jython.base.dir}/registry" preservelastmodified="true" overwrite="true" />
</target>
<target name="copy-cpythonlib">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <otm...@us...> - 2009-04-29 08:36:17
|
Revision: 6278
http://jython.svn.sourceforge.net/jython/?rev=6278&view=rev
Author: otmarhumbel
Date: 2009-04-29 08:36:15 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
increase jython version numbers to 2.5 beta 4
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-04-29 05:48:23 UTC (rev 6277)
+++ trunk/jython/build.xml 2009-04-29 08:36:15 UTC (rev 6278)
@@ -185,13 +185,13 @@
<property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
<!-- The current version info -->
- <property name="jython.version" value="2.5b3+"/>
- <property name="jython.version.noplus" value="2.5b3"/>
+ <property name="jython.version" value="2.5b4+"/>
+ <property name="jython.version.noplus" value="2.5b4"/>
<property name="jython.major_version" value="2"/>
<property name="jython.minor_version" value="5"/>
<property name="jython.micro_version" value="0"/>
<property name="jython.release_level" value="${PY_RELEASE_LEVEL_BETA}"/>
- <property name="jython.release_serial" value="3"/>
+ <property name="jython.release_serial" value="4"/>
<condition property="do.snapshot.build">
<isset property="snapshot.revision" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <otm...@us...> - 2009-05-02 07:55:29
|
Revision: 6286
http://jython.svn.sourceforge.net/jython/?rev=6286&view=rev
Author: otmarhumbel
Date: 2009-05-02 07:55:28 +0000 (Sat, 02 May 2009)
Log Message:
-----------
java tests need a populated /dist folder
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-05-02 06:13:13 UTC (rev 6285)
+++ trunk/jython/build.xml 2009-05-02 07:55:28 UTC (rev 6286)
@@ -809,7 +809,7 @@
<!-- Clean any old test output -->
<delete dir="${junit.reports}"/>
</target>
- <target name="javatest" depends="compile,expose">
+ <target name="javatest" depends="developer-build">
<mkdir dir="${junit.reports}"/>
<junit fork="true" printsummary="true">
<formatter type="xml"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2009-05-07 03:49:00
|
Revision: 6313
http://jython.svn.sourceforge.net/jython/?rev=6313&view=rev
Author: pjenvey
Date: 2009-05-07 03:48:51 +0000 (Thu, 07 May 2009)
Log Message:
-----------
disable Xlint:cast, unfortunately antlr.PythonParser has a ton
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-05-07 03:48:35 UTC (rev 6312)
+++ trunk/jython/build.xml 2009-05-07 03:48:51 UTC (rev 6313)
@@ -120,7 +120,7 @@
<property name="deprecation" value="true" />
<property name="debug" value="true" />
<property name="nowarn" value="false" />
- <property name="javac.args" value="-Xlint -Xlint:-serial -Xlint:-unchecked"/>
+ <property name="javac.args" value="-Xlint -Xlint:-serial -Xlint:-unchecked -Xlint:-cast"/>
<!-- properties work.dir and jython.base.dir are also defined in full-preinit -->
<property name="work.dir" value="${basedir}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2009-05-10 20:29:14
|
Revision: 6331
http://jython.svn.sourceforge.net/jython/?rev=6331&view=rev
Author: pjenvey
Date: 2009-05-10 20:29:04 +0000 (Sun, 10 May 2009)
Log Message:
-----------
javac.args -> javac.Xlint, so we can more clearly override Xlint settings
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-05-10 19:10:53 UTC (rev 6330)
+++ trunk/jython/build.xml 2009-05-10 20:29:04 UTC (rev 6331)
@@ -120,7 +120,7 @@
<property name="deprecation" value="true" />
<property name="debug" value="true" />
<property name="nowarn" value="false" />
- <property name="javac.args" value="-Xlint -Xlint:-serial -Xlint:-unchecked -Xlint:-cast"/>
+ <property name="javac.Xlint" value="-Xlint -Xlint:-serial -Xlint:-unchecked -Xlint:-cast"/>
<!-- properties work.dir and jython.base.dir are also defined in full-preinit -->
<property name="work.dir" value="${basedir}" />
@@ -414,7 +414,7 @@
deprecation="${deprecation}"
nowarn="${nowarn}">
<include name="org/python/util/TemplateAntTask.java" />
- <compilerarg line="${javac.args}"/>
+ <compilerarg line="${javac.Xlint}"/>
</javac>
</target>
@@ -458,7 +458,7 @@
nowarn="${nowarn}"
memoryMaximumSize="192m"
fork="true">
- <compilerarg line="${javac.args}"/>
+ <compilerarg line="${javac.Xlint}"/>
<src path="${source.dir}"/>
<src path="${gensrc.dir}"/>
@@ -475,7 +475,7 @@
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}">
- <compilerarg line="${javac.args}"/>
+ <compilerarg line="${javac.Xlint}"/>
</javac>
<!-- java files used by tests -->
@@ -486,7 +486,7 @@
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}">
- <compilerarg line="${javac.args}"/>
+ <compilerarg line="${javac.Xlint}"/>
<classpath refid="test.classpath" />
</javac>
<javac srcdir="tests/data/initializer"
@@ -496,7 +496,7 @@
debug="${debug}"
deprecation="${deprecation}"
nowarn="${nowarn}">
- <compilerarg line="${javac.args}"/>
+ <compilerarg line="${javac.Xlint}"/>
<classpath refid="test.classpath" />
</javac>
<copy file="${source.dir}/org/python/modules/ucnhash.dat"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-05-11 14:45:49
|
Revision: 6337
http://jython.svn.sourceforge.net/jython/?rev=6337&view=rev
Author: fwierzbicki
Date: 2009-05-11 14:45:39 +0000 (Mon, 11 May 2009)
Log Message:
-----------
We shouldn't be distributing jdbc jars, even in the installer.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-05-11 03:48:59 UTC (rev 6336)
+++ trunk/jython/build.xml 2009-05-11 14:45:39 UTC (rev 6337)
@@ -655,9 +655,16 @@
<include name="Lib/jxxload_help/*.java" />
<include name="src/org/**/ucnhash.dat" />
<include name="grammar/*.g" />
- <include name="extlibs/**/*.jar" />
<include name="tests/java/**/*.java" />
<include name="CoreExposed.includes" />
+ <include name="extlibs/**/*.jar" />
+
+ <!-- don't distribute jdbc jars -->
+ <exclude name="extlibs/mysql-connector-java-5.1.6.jar" />
+ <exclude name="extlibs/postgresql-8.3-603.jdbc4.jar" />
+ <exclude name="extlibs/ifxjdbc.jar" />
+ <exclude name="extlibs/ojdbc14.jar" />
+
</fileset>
</copy>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-05-11 21:00:55
|
Revision: 6340
http://jython.svn.sourceforge.net/jython/?rev=6340&view=rev
Author: fwierzbicki
Date: 2009-05-11 21:00:49 +0000 (Mon, 11 May 2009)
Log Message:
-----------
Drop name mangle of jline for now since it breaks windows.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-05-11 16:14:06 UTC (rev 6339)
+++ trunk/jython/build.xml 2009-05-11 21:00:49 UTC (rev 6340)
@@ -563,7 +563,9 @@
<rule pattern="org.apache.wml.**" result="org.python.apache.wml.@1"/>
<rule pattern="org.apache.html.**" result="org.python.apache.html.@1"/>
<zipfileset src="extlibs/jline-0.9.95-SNAPSHOT.jar"/>
+ <!--
<rule pattern="jline.**" result="org.python.jline.@1"/>
+ -->
<manifest>
<attribute name="Main-Class" value="org.python.util.jython" />
<attribute name="Built-By" value="${user.name}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-07-12 00:18:10
|
Revision: 6530
http://jython.svn.sourceforge.net/jython/?rev=6530&view=rev
Author: fwierzbicki
Date: 2009-07-12 00:18:02 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
upped memory for antlr task. Needed for (at least) JDK 6 on OS X.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-07-11 23:22:13 UTC (rev 6529)
+++ trunk/jython/build.xml 2009-07-12 00:18:02 UTC (rev 6530)
@@ -428,6 +428,7 @@
<target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
<java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}">
+ <jvmarg value="-Xmx1024m"/>
<arg value="-Xconversiontimeout"/>
<arg value="2000"/>
<arg value="-fo"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-07-12 00:53:27
|
Revision: 6531
http://jython.svn.sourceforge.net/jython/?rev=6531&view=rev
Author: fwierzbicki
Date: 2009-07-12 00:53:25 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
reducing heap memory for antlr task from 1024 to 128 since that appears to be
enough for the problematic case (JDK 6 on OS X).
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-07-12 00:18:02 UTC (rev 6530)
+++ trunk/jython/build.xml 2009-07-12 00:53:25 UTC (rev 6531)
@@ -428,7 +428,7 @@
<target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
<java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}">
- <jvmarg value="-Xmx1024m"/>
+ <jvmarg value="-Xmx128m"/>
<arg value="-Xconversiontimeout"/>
<arg value="2000"/>
<arg value="-fo"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cg...@us...> - 2009-07-19 06:17:03
|
Revision: 6545
http://jython.svn.sourceforge.net/jython/?rev=6545&view=rev
Author: cgroves
Date: 2009-07-19 06:16:59 +0000 (Sun, 19 Jul 2009)
Log Message:
-----------
Properties are fixed once they're set, so there's no need to set them conditionally.
Don't force an overwrite on the registry file in dev builds.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-07-19 05:35:22 UTC (rev 6544)
+++ trunk/jython/build.xml 2009-07-19 06:16:59 UTC (rev 6545)
@@ -367,11 +367,7 @@
<!-- skip-brand can be set in ant.properties or as a system property to keep from updating the
version.properties file and making the jar on every developer build. -->
<target name="brand-version" depends="init, svnversion" unless="skip-brand">
- <condition property="build.svn.revision" value="">
- <not>
- <isset property="build.svn.revision"/>
- </not>
- </condition>
+ <property name="build.svn.revision" value=""/>
<tstamp>
<format property="build.date" pattern="MMM d yyyy" offset="0"/>
<format property="build.time" pattern="HH:mm:ss" offset="0"/>
@@ -719,7 +715,7 @@
</chmod>
<!-- copy the registry -->
- <copy todir="${dist.dir}" file="${jython.base.dir}/registry" preservelastmodified="true" overwrite="true" />
+ <copy todir="${dist.dir}" file="${jython.base.dir}/registry" preservelastmodified="true"/>
</target>
<target name="copy-cpythonlib">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cg...@us...> - 2009-07-19 06:49:52
|
Revision: 6547
http://jython.svn.sourceforge.net/jython/?rev=6547&view=rev
Author: cgroves
Date: 2009-07-19 06:49:49 +0000 (Sun, 19 Jul 2009)
Log Message:
-----------
Move version-init into init as it wasn't used separately, and add a fileset to the jarring to shut up ant's spurious warning about no files being included
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-07-19 06:23:03 UTC (rev 6546)
+++ trunk/jython/build.xml 2009-07-19 06:49:49 UTC (rev 6547)
@@ -113,7 +113,38 @@
</uptodate>
</target>
- <target name="init" depends="version-init">
+ <target name="init">
+ <property file="${user.home}/ant.properties" />
+ <property file="${basedir}/ant.properties" />
+
+ <property name="PY_RELEASE_LEVEL_ALPHA" value="10"/> <!-- 0xA -->
+ <property name="PY_RELEASE_LEVEL_BETA" value="11"/> <!-- 0xB -->
+ <property name="PY_RELEASE_LEVEL_GAMMA" value="12"/> <!-- 0xC -->
+ <property name="PY_RELEASE_LEVEL_FINAL" value="15"/> <!-- 0xF -->
+ <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
+
+ <!-- The current version info -->
+ <property name="jython.version" value="2.5.0+"/>
+ <property name="jython.version.noplus" value="2.5.0"/>
+ <property name="jython.major_version" value="2"/>
+ <property name="jython.minor_version" value="5"/>
+ <property name="jython.micro_version" value="0"/>
+ <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
+ <property name="jython.release_serial" value="0"/>
+
+ <condition property="do.snapshot.build">
+ <isset property="snapshot.revision" />
+ </condition>
+ <!-- Switch to a snapshot release_level when appropriate -->
+ <condition property="jython.real_release_level" value="${PY_RELEASE_LEVEL_SNAPSHOT}" else="${jython.release_level}">
+ <isset property="do.snapshot.build" />
+ </condition>
+ <condition property="os.family.unix">
+ <os family="unix"/>
+ </condition>
+ <condition property="os.family.windows">
+ <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" />
@@ -177,40 +208,6 @@
<property name="jython.deploy.jar" value="jython.jar" />
</target>
- <target name="version-init">
- <property file="${user.home}/ant.properties" />
- <property file="${basedir}/ant.properties" />
-
- <property name="PY_RELEASE_LEVEL_ALPHA" value="10"/> <!-- 0xA -->
- <property name="PY_RELEASE_LEVEL_BETA" value="11"/> <!-- 0xB -->
- <property name="PY_RELEASE_LEVEL_GAMMA" value="12"/> <!-- 0xC -->
- <property name="PY_RELEASE_LEVEL_FINAL" value="15"/> <!-- 0xF -->
- <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
-
- <!-- The current version info -->
- <property name="jython.version" value="2.5.0+"/>
- <property name="jython.version.noplus" value="2.5.0"/>
- <property name="jython.major_version" value="2"/>
- <property name="jython.minor_version" value="5"/>
- <property name="jython.micro_version" value="0"/>
- <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
- <property name="jython.release_serial" value="0"/>
-
- <condition property="do.snapshot.build">
- <isset property="snapshot.revision" />
- </condition>
- <!-- Switch to a snapshot release_level when appropriate -->
- <condition property="jython.real_release_level" value="${PY_RELEASE_LEVEL_SNAPSHOT}" else="${jython.release_level}">
- <isset property="do.snapshot.build" />
- </condition>
- <condition property="os.family.unix">
- <os family="unix"/>
- </condition>
- <condition property="os.family.windows">
- <os family="windows"/>
- </condition>
- </target>
-
<target name="full-preinit">
<property file="${user.home}/ant.properties" />
<property file="${basedir}/ant.properties" />
@@ -593,9 +590,13 @@
<fileset dir="${compile.dir}" includes="org/python/tests/Callbacker*"/>
</jar>
<jar destfile="${dist.dir}/${jython.dev.jar}" duplicate="fail">
+ <!-- If only nameunion is used, ant issues a spurious warning about no files being
+ included. Use a fileset for version.properties just to shut that up. -->
+ <fileset dir="${compile.dir}" includes="org/python/version.properties"/>
<nameunion>
<fileset dir="${exposed.dir}"/>
- <fileset dir="${compile.dir}" excludes="org/python/expose/generate/**"/>
+ <fileset dir="${compile.dir}"
+ excludes="org/python/expose/generate/**,org/python/version.properties"/>
</nameunion>
<manifest>
<attribute name="Main-Class" value="org.python.util.jython" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nr...@us...> - 2009-07-31 19:20:11
|
Revision: 6617
http://jython.svn.sourceforge.net/jython/?rev=6617&view=rev
Author: nriley
Date: 2009-07-31 19:20:05 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
Set python.home for singlejavatest so ScriptEngineIOTest works.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-07-31 19:19:56 UTC (rev 6616)
+++ trunk/jython/build.xml 2009-07-31 19:20:05 UTC (rev 6617)
@@ -822,6 +822,7 @@
<junit haltonfailure="true" fork="true">
<formatter type="brief" usefile="false"/>
<sysproperty key="python.cachedir.skip" value="true"/>
+ <sysproperty key="python.home" value="${dist.dir}"/>
<classpath refid="test.classpath"/>
<batchtest>
<fileset dir="${test.source.dir}" includes="**/${test}.java"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nr...@us...> - 2009-08-02 00:09:18
|
Revision: 6622
http://jython.svn.sourceforge.net/jython/?rev=6622&view=rev
Author: nriley
Date: 2009-08-02 00:09:03 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
Set python.home for javatest as well, so ScriptEngineIOTest works.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-08-01 21:19:21 UTC (rev 6621)
+++ trunk/jython/build.xml 2009-08-02 00:09:03 UTC (rev 6622)
@@ -837,6 +837,7 @@
<mkdir dir="${junit.reports}"/>
<junit fork="true" printsummary="true">
<formatter type="xml"/>
+ <sysproperty key="python.home" value="${dist.dir}"/>
<classpath refid="test.classpath"/>
<batchtest todir="${junit.reports}">
<fileset dir="${test.source.dir}" includes="**/*Test*.java">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-08-17 18:41:20
|
Revision: 6692
http://jython.svn.sourceforge.net/jython/?rev=6692&view=rev
Author: fwierzbicki
Date: 2009-08-17 18:41:12 +0000 (Mon, 17 Aug 2009)
Log Message:
-----------
Added "devclean": deletes everything but the generated antlr files, cachedir,
and Lib.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-08-17 13:25:59 UTC (rev 6691)
+++ trunk/jython/build.xml 2009-08-17 18:41:12 UTC (rev 6692)
@@ -108,7 +108,7 @@
<target name="full-build" depends="full-check, install" description="a full build with svn checkout" />
<target name="needed-check" unless="full-build">
- <uptodate property="antlr.notneeded" targetfile="${dist.dir}/${jython.dev.jar}">
+ <uptodate property="antlr.notneeded" targetfile="${gensrc.dir}/org/python/antlr/PythonParser.java">
<srcfiles dir="grammar" includes="*.g" />
</uptodate>
</target>
@@ -307,6 +307,23 @@
</delete>
</target>
+ <target name="devclean" depends="init"
+ description="clean up build working directories, without deleting antlr files, cachedir, or Lib.">
+
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="${output.dir}" includes="**/*" excludes="gensrc/**"/>
+ </delete>
+ <!-- deletes all files and subdirectories of ${dist.dir}, without ${dist.dir} itself. -->
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="${dist.dir}" includes="**/*" excludes="cachedir/**,Lib/**"/>
+ </delete>
+ <!-- delete the installation .jar file from ${work.dir}, but no other files -->
+ <delete failonerror="false">
+ <fileset dir="${work.dir}" includes="jython*.jar" />
+ </delete>
+ </target>
+
+
<!-- clean svn.checkout.dir if we really checkout -->
<target name="clean-checkout-dir" if="do.checkout">
<delete includeemptydirs="true" failonerror="false">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-09-01 14:24:48
|
Revision: 6740
http://jython.svn.sourceforge.net/jython/?rev=6740&view=rev
Author: fwierzbicki
Date: 2009-09-01 14:24:42 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Mark release as Gamma level (release candidate) and serial of 1.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-09-01 14:02:31 UTC (rev 6739)
+++ trunk/jython/build.xml 2009-09-01 14:24:42 UTC (rev 6740)
@@ -129,8 +129,8 @@
<property name="jython.major_version" value="2"/>
<property name="jython.minor_version" value="5"/>
<property name="jython.micro_version" value="1"/>
- <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
- <property name="jython.release_serial" value="0"/>
+ <property name="jython.release_level" value="${PY_RELEASE_LEVEL_GAMMA}"/>
+ <property name="jython.release_serial" value="1"/>
<condition property="do.snapshot.build">
<isset property="snapshot.revision" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-09-01 14:26:07
|
Revision: 6741
http://jython.svn.sourceforge.net/jython/?rev=6741&view=rev
Author: fwierzbicki
Date: 2009-09-01 14:25:55 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Crud, also update the version text strings.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2009-09-01 14:24:42 UTC (rev 6740)
+++ trunk/jython/build.xml 2009-09-01 14:25:55 UTC (rev 6741)
@@ -124,8 +124,8 @@
<property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
<!-- The current version info -->
- <property name="jython.version" value="2.5.0+"/>
- <property name="jython.version.noplus" value="2.5.0"/>
+ <property name="jython.version" value="2.5.1+"/>
+ <property name="jython.version.noplus" value="2.5.1"/>
<property name="jython.major_version" value="2"/>
<property name="jython.minor_version" value="5"/>
<property name="jython.micro_version" value="1"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nr...@us...> - 2010-01-23 22:57:27
|
Revision: 6961
http://jython.svn.sourceforge.net/jython/?rev=6961&view=rev
Author: nriley
Date: 2010-01-23 22:57:19 +0000 (Sat, 23 Jan 2010)
Log Message:
-----------
Better documentation and cleanup of some obsolete bits of build.xml.
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2010-01-22 02:51:19 UTC (rev 6960)
+++ trunk/jython/build.xml 2010-01-23 22:57:19 UTC (rev 6961)
@@ -1,42 +1,43 @@
<!-- Copyright 2000 Dj Walker-Morgan -->
<project name="jython" default="developer-build" basedir=".">
- <target name="usage" description="prints usage hints">
+ <target name="usage" description="print usage hints (-emacs removes [echo] prefix)">
<echo>
-Use case 1: developer build (in your local jython copy)
+Use case 1: developer build (in your local Jython copy)
-------------------------------------------------------
- - call target 'developer-build' (which is the default for this build.xml)
+ - call target 'developer-build' (the default for this build.xml)
+
This build will create directories /build and /dist below basedir.
Use case 2: full build for a release (using svn checkout)
---------------------------------------------------------
- - make sure you have access to the jython subversion repository (https://jython.svn.sourceforge.net/svnroot/jython/trunk)
+ - make sure you have access to the Jython Subversion repository
+ (https://jython.svn.sourceforge.net/svnroot/jython/trunk)
- override svn.main.dir in ant.properties (if necessary)
- call target 'full-build'
-This build will create a working directory named full_build/${svn.main.dir} at the same
-level as your local directories jython, sandbox and installer.
-It will contain a big jython_installer-${jython.version}.jar file suitable for installation.
-Please be aware:
-To build older releases, it may be necessary to use an older build.xml, too (with the corresponding tag).
-For example it is not possible to build Release_2_2alpha1 with this version of build.xml.
+This build will create a working directory named
+full_build/${svn.main.dir} at the same level as your local directories
+jython, sandbox and installer. It will contain a big
+jython_installer-${jython.version}.jar file suitable for installation.
+To build older releases, it may be necessary to use an older
+build.xml, too (with the corresponding tag). For example it is not
+possible to build Release_2_2alpha1 with this version of build.xml.
+
Note on targets
---------------
-The following targets are designed for direct invocation:
- - usage
- - developer-build
- - full-build
- - clean (uses developer-build settings if called directly)
-Following an ant convention, the callable targets have a description attribute.
-All other targets may give unpredicted results if called directly.
+A subset of the available targets are designed for direct invocation.
+Following an ant convention, the callable targets have a description
+attribute. Use ant -p to display these targets. All other targets
+may behave unpredictably if called directly.
-Where ant.properties are searched
----------------------------------
+Where ant looks for ant.properties
+----------------------------------
1. in user.home
2. in the same directory as this build.xml file
-The first setting of a property wins, further settings are ignored.
+The first setting of a property wins. Further settings are ignored.
Actions for a release
@@ -47,9 +48,6 @@
An example ant.properties file:
-------------------------------
-# - define the home of the corresponding CPython version
-python.home=c:/Programme/Python/Python23
-
# - zxJDBC
oracle.jar=C:/workspace/HEAD/for_development/bisdevsrv28/jboss/server/infra/lib/ojdbc14.jar
#informix.jar=${basedir}/../externals/external-jars/ifxjdbc.jar
@@ -244,7 +242,6 @@
<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="python.exe" value="${python.home}/python" />
<!-- 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">
@@ -292,7 +289,6 @@
<echo>debug = '${debug}'</echo>
<echo>nowarn = '${nowarn}'</echo>
<echo>--- properties (used for full-build only) ---</echo>
- <echo>python.exe = '${python.exe}'</echo>
<echo>svn.main.dir = '${svn.main.dir}'</echo>
<echo>svn.revision = '${svn.revision}'</echo>
<echo>svn.checkout.dir = '${svn.checkout.dir}'</echo>
@@ -323,7 +319,7 @@
</target>
<target name="devclean" depends="init"
- description="clean up build working directories, without deleting antlr files, cachedir, or Lib.">
+ description="clean up build working directories without deleting antlr files, cachedir, or Lib">
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${output.dir}" includes="**/*" excludes="gensrc/**"/>
@@ -866,8 +862,8 @@
</jar>
</target>
- <target name="test" depends="prepare-test,javatest,launchertest,regrtest,modjytest"/>
- <target name="singlejavatest" depends="compile,expose">
+ <target name="test" depends="prepare-test,javatest,launchertest,regrtest,modjytest" description="run all the tests"/>
+ <target name="singlejavatest" depends="compile,expose" description="run a single JUnit test (specify with -Dtest=classname)">
<junit haltonfailure="true" fork="true">
<formatter type="brief" usefile="false"/>
<sysproperty key="python.cachedir.skip" value="true"/>
@@ -882,7 +878,7 @@
<!-- Clean any old test output -->
<delete dir="${junit.reports}"/>
</target>
- <target name="javatest" depends="developer-build">
+ <target name="javatest" depends="developer-build" description="run all the JUnit tests">
<mkdir dir="${junit.reports}"/>
<junit fork="true" printsummary="true">
<formatter type="xml"/>
@@ -908,7 +904,7 @@
<arg value="${dist.dir}"/>
</exec>
</target>
- <target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
+ <target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows" description="run Python tests expected to work on Jython"/>
<target name="regrtest-unix" if="os.family.unix">
<exec executable="${dist.dir}/bin/jython">
<arg value="${dist.dir}/Lib/test/regrtest.py"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <otm...@us...> - 2010-09-10 11:45:02
|
Revision: 7118
http://jython.svn.sourceforge.net/jython/?rev=7118&view=rev
Author: otmarhumbel
Date: 2010-09-10 11:44:56 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
default svn.revision to HEAD
this allows rebuilding releases without remembering the exact revision number
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2010-09-09 16:28:05 UTC (rev 7117)
+++ trunk/jython/build.xml 2010-09-10 11:44:56 UTC (rev 7118)
@@ -70,9 +70,10 @@
#svn.main.dir=trunk
# - the revision; only needed for a snapshot full-build
-# To create a snapshot build: uncomment and indicate the correct revision (it has to be a number)
+# To create a snapshot build: uncomment the two revision lines, and indicate the correct revision (it has to be a number)
# For 'normal' builds, this defaults to the latest revision on svn.main.dir (HEAD)
-#snapshot.revision=3444
+#svn.revision=7114
+#snapshot.revision=${svn.revision}
# - the directory containing libsvnjavahl-1.dll (on windows) and svnjavahl.jar; only needed for full-build
# how to get these (for windows):
@@ -241,6 +242,8 @@
<property name="svn.main.dir" value="trunk" />
<property name="svn.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" />
<!-- properties work.dir and jython.base.dir are also definied in init,
so full-preinit must run first to work -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2011-03-11 20:40:13
|
Revision: 7209
http://jython.svn.sourceforge.net/jython/?rev=7209&view=rev
Author: pjenvey
Date: 2011-03-11 20:40:07 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
bump version to 2.6
Modified Paths:
--------------
trunk/jython/build.xml
Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml 2011-03-11 20:24:05 UTC (rev 7208)
+++ trunk/jython/build.xml 2011-03-11 20:40:07 UTC (rev 7209)
@@ -123,12 +123,12 @@
<property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
<!-- The current version info -->
- <property name="jython.version" value="2.5.2"/>
- <property name="jython.version.noplus" value="2.5.2"/>
+ <property name="jython.version" value="2.6a0+"/>
+ <property name="jython.version.noplus" value="2.6a0"/>
<property name="jython.major_version" value="2"/>
- <property name="jython.minor_version" value="5"/>
- <property name="jython.micro_version" value="2"/>
- <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
+ <property name="jython.minor_version" value="6"/>
+ <property name="jython.micro_version" value="0"/>
+ <property name="jython.release_level" value="${PY_RELEASE_LEVEL_ALPHA}"/>
<property name="jython.release_serial" value="0"/>
<condition property="do.snapshot.build">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X