From: <fwi...@us...> - 2008-09-06 18:31:16
|
Revision: 5293 http://jython.svn.sourceforge.net/jython/?rev=5293&view=rev Author: fwierzbicki Date: 2008-09-06 18:31:14 +0000 (Sat, 06 Sep 2008) Log Message: ----------- Switch back installer25 -> installer. Leaked in from asm branch. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-06 04:28:11 UTC (rev 5292) +++ trunk/jython/build.xml 2008-09-06 18:31:14 UTC (rev 5293) @@ -219,7 +219,7 @@ <!-- predefined main directory for checkout --> <property name="svn.main.dir" value="branches" /> <property name="svn.code.dir" value="asm" /> - <property name="svn.installer.dir" value="installer25" /> + <property name="svn.installer.dir" value="installer" /> <!-- properties work.dir and jython.base.dir are also definied in init, so full-preinit must run first to work --> @@ -696,7 +696,7 @@ <!-- wrap the build into the installer --> <target name="install" depends="brand-readme-version, install-init, jar-complete, javadoc, copy-full"> - <property name="install.src.dir" value="${jython.base.dir}/../installer25/src/java" /> + <property name="install.src.dir" value="${jython.base.dir}/../installer/src/java" /> <echo>compiling installer from ${install.src.dir}</echo> <javac srcdir="${install.src.dir}" includes="org/**" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2008-09-06 18:58:04
|
Revision: 5294 http://jython.svn.sourceforge.net/jython/?rev=5294&view=rev Author: fwierzbicki Date: 2008-09-06 18:58:02 +0000 (Sat, 06 Sep 2008) Log Message: ----------- increment version. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-06 18:31:14 UTC (rev 5293) +++ trunk/jython/build.xml 2008-09-06 18:58:02 UTC (rev 5294) @@ -184,8 +184,8 @@ <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA --> <!-- The current version info --> - <property name="jython.version" value="2.5a1+"/> - <property name="jython.version.noplus" value="2.5a1"/> + <property name="jython.version" value="2.5a2+"/> + <property name="jython.version.noplus" value="2.5a2"/> <property name="jython.major_version" value="2"/> <property name="jython.minor_version" value="5"/> <property name="jython.micro_version" value="1"/> @@ -392,7 +392,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.5a1+' + <replace file="${jython.base.dir}/README.txt" token='2.5a2+' value='2.5a${svn.revision}' /> <replace file="${jython.base.dir}/README.txt"> <replacetoken>=======================</replacetoken> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2008-09-06 20:57:48
|
Revision: 5297 http://jython.svn.sourceforge.net/jython/?rev=5297&view=rev Author: fwierzbicki Date: 2008-09-06 20:57:46 +0000 (Sat, 06 Sep 2008) Log Message: ----------- Remove more leakage from asm branch into build.xml. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-06 20:07:25 UTC (rev 5296) +++ trunk/jython/build.xml 2008-09-06 20:57:46 UTC (rev 5297) @@ -217,8 +217,8 @@ <property name="full-build" value="true" /> <!-- predefined main directory for checkout --> - <property name="svn.main.dir" value="branches" /> - <property name="svn.code.dir" value="asm" /> + <property name="svn.main.dir" value="trunk" /> + <property name="svn.code.dir" value="jython" /> <property name="svn.installer.dir" value="installer" /> <!-- properties work.dir and jython.base.dir are also definied in init, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-09-09 22:34:58
|
Revision: 5308 http://jython.svn.sourceforge.net/jython/?rev=5308&view=rev Author: otmarhumbel Date: 2008-09-09 22:34:55 +0000 (Tue, 09 Sep 2008) Log Message: ----------- applied leosoto's patch from http://bugs.jython.org/issue1077 to avoid duplicate entries in jython-complete.jar Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-09 21:15:54 UTC (rev 5307) +++ trunk/jython/build.xml 2008-09-09 22:34:55 UTC (rev 5308) @@ -533,9 +533,9 @@ </target> <target name="jar-complete" depends="compile,expose,jarjar"> - <jar destfile="${dist.dir}/jython-complete.jar"> + <jar destfile="${dist.dir}/jython-complete.jar" duplicate="preserve"> + <fileset dir="${exposed.dir}"/> <fileset dir="${compile.dir}"/> - <fileset dir="${exposed.dir}"/> <fileset dir="${jarjar.dir}"> </fileset> <manifest> @@ -557,9 +557,9 @@ </target> <target name="jar" depends="compile,expose,jarjar"> - <jar destfile="${dist.dir}/jython.jar"> + <jar destfile="${dist.dir}/jython.jar" duplicate="preserve"> + <fileset dir="${exposed.dir}"/> <fileset dir="${compile.dir}"/> - <fileset dir="${exposed.dir}"/> <fileset dir="${jarjar.dir}"> <include name="org/python/objectweb/asm/ClassReader.class" /> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-09-10 22:45:09
|
Revision: 5314 http://jython.svn.sourceforge.net/jython/?rev=5314&view=rev Author: otmarhumbel Date: 2008-09-10 22:45:07 +0000 (Wed, 10 Sep 2008) Log Message: ----------- since property cpythonlib.present is always true if jython is checked out correctly, but is evaluated too early (long before checkout) during a full-build, it has probably no usage any more Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-10 18:36:16 UTC (rev 5313) +++ trunk/jython/build.xml 2008-09-10 22:45:07 UTC (rev 5314) @@ -162,7 +162,6 @@ <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" /> <available property="oracle.present" classname="oracle.jdbc.driver.OracleDriver" classpath="${oracle.jar}" /> - <available property="cpythonlib.present" file="${jython.base.dir}/CPythonLib.includes"/> <path id="test.classpath"> <path refid="main.classpath"/> @@ -667,7 +666,7 @@ </target> - <target name="copy-cpythonlib" if="cpythonlib.present"> + <target name="copy-cpythonlib"> <copy todir="${dist.dir}/Lib"> <fileset dir="${python.lib}" excludes="**/*.pyc, **/*.pyo" includesfile="${jython.base.dir}/CPythonLib.includes"> <!-- The include file gets all of CPythonLib's test directory, but we only want the ones from Jython's Lib. --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-09-10 23:06:06
|
Revision: 5315 http://jython.svn.sourceforge.net/jython/?rev=5315&view=rev Author: otmarhumbel Date: 2008-09-10 23:06:04 +0000 (Wed, 10 Sep 2008) Log Message: ----------- reintroduced the possibility to suppress checkout in full-build (setting do.checkout to 'false' does not prevent from checking out, but not setting the property at all really does) so full-build behaviour should remain the same Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-10 22:45:07 UTC (rev 5314) +++ trunk/jython/build.xml 2008-09-10 23:06:04 UTC (rev 5315) @@ -225,14 +225,12 @@ <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="has.repositories.connection" value="true" /> <property name="python.exe" value="${python.home}/python" /> - <property name="do.checkout" value="false" /> - <!-- + <!-- 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"> <istrue value="${has.repositories.connection}" /> </condition> - --> <!-- classpath for svn ant task --> <path id="svn.classpath"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2008-09-11 00:39:46
|
Revision: 5317 http://jython.svn.sourceforge.net/jython/?rev=5317&view=rev Author: fwierzbicki Date: 2008-09-11 00:39:43 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Change defaults for alpha 3. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-09-11 00:37:30 UTC (rev 5316) +++ trunk/jython/build.xml 2008-09-11 00:39:43 UTC (rev 5317) @@ -183,11 +183,11 @@ <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA --> <!-- The current version info --> - <property name="jython.version" value="2.5a2+"/> - <property name="jython.version.noplus" value="2.5a2"/> + <property name="jython.version" value="2.5a3+"/> + <property name="jython.version.noplus" value="2.5a3"/> <property name="jython.major_version" value="2"/> <property name="jython.minor_version" value="5"/> - <property name="jython.micro_version" value="1"/> + <property name="jython.micro_version" value="3"/> <property name="jython.release_level" value="${PY_RELEASE_LEVEL_ALPHA}"/> <property name="jython.release_serial" value="0"/> @@ -389,7 +389,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.5a2+' + <replace file="${jython.base.dir}/README.txt" token='2.5a3+' value='2.5a${svn.revision}' /> <replace file="${jython.base.dir}/README.txt"> <replacetoken>=======================</replacetoken> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2008-10-14 01:47:36
|
Revision: 5389 http://jython.svn.sourceforge.net/jython/?rev=5389&view=rev Author: cgroves Date: 2008-10-14 01:47:30 +0000 (Tue, 14 Oct 2008) Log Message: ----------- Jarjar if antlr changed more recently than the jarjar'd jar. Jar. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-10-13 20:38:36 UTC (rev 5388) +++ trunk/jython/build.xml 2008-10-14 01:47:30 UTC (rev 5389) @@ -111,6 +111,7 @@ <target name="needed-check" unless="full-build"> <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> <srcfiles dir="extlibs" includes="*" /> + <srcfiles dir="grammar" includes="*.g" /> </uptodate> <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar"> <srcfiles dir="grammar" includes="*.g" /> @@ -316,14 +317,10 @@ want to comment this out, as a clean is really only needed if you change the tokens defined in Python.g (and cleans make the build slow) --> <antcall target="clean"/> - <!-- force jarjar build --> - <property name="jarjar.needed" value="true" /> </target> - - <target name ="prepare-output" depends="init,needed-check,clean-if-antlr-needed,make-output-dirs"/> - + <!-- create output directories --> - <target name ="make-output-dirs" depends="init"> + <target name ="prepare-output" depends="init,needed-check,clean-if-antlr-needed"> <mkdir dir="${compile.dir}" /> <mkdir dir="${jarjar.dir}" /> <mkdir dir="${gensrc.dir}/org/python/antlr" /> @@ -506,10 +503,7 @@ includesfile="${jython.base.dir}/CoreExposed.includes"/> </target> - <!-- XXX: this should be conditional if="jarjar.needed" or unless="jarjar.notneeded" - but I haven't been able to get this to work. For now always do jarjar - --> - <target name="jarjar" depends="init,needed-check"> + <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded"> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/> <jarjar destfile="${output.dir}/jarjar.jar"> <zipfileset src="extlibs/antlr-runtime-3.1.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-10-17 23:55:57
|
Revision: 5458 http://jython.svn.sourceforge.net/jython/?rev=5458&view=rev Author: pjenvey Date: 2008-10-17 23:55:52 +0000 (Fri, 17 Oct 2008) Log Message: ----------- allow more heap for the regrtest to avoid the OutOfMemory errors. we don't seem to actually be leaking -- we just have more test modules Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-10-17 21:21:36 UTC (rev 5457) +++ trunk/jython/build.xml 2008-10-17 23:55:52 UTC (rev 5458) @@ -171,6 +171,7 @@ <pathelement path="${exposed.dir}" /> <pathelement path="${compile.dir}" /> </path> + <property name="regrtest.Xmx" value="-Xmx96m" /> </target> <target name="version-init"> @@ -757,6 +758,7 @@ <target name="regrtest-unix" if="os.family.unix"> <exec executable="${dist.dir}/bin/jython"> <arg value="--verify"/> + <arg value="-J${regrtest.Xmx}"/> <arg value="${dist.dir}/Lib/test/regrtest.py"/> <!-- Only run the tests that are expected to work on Jython --> <arg value="--expected"/> @@ -764,6 +766,7 @@ </target> <target name="regrtest-windows" if="os.family.windows"> <exec executable="${dist.dir}/bin/jython.bat"> + <arg value="-J${regrtest.Xmx}"/> <arg value="${dist.dir}/Lib/test/regrtest.py"/> <!-- Only run the tests that are expected to work on Jython --> <arg value="--expected"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2008-11-09 20:15:19
|
Revision: 5559 http://jython.svn.sourceforge.net/jython/?rev=5559&view=rev Author: cgroves Date: 2008-11-09 20:15:15 +0000 (Sun, 09 Nov 2008) Log Message: ----------- Force jarjar to run if antlr is going to do a clean. This was causing the build to get into a weird state requiring a clean if local compilation failed after antlr changed. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-11-09 19:46:24 UTC (rev 5558) +++ trunk/jython/build.xml 2008-11-09 20:15:15 UTC (rev 5559) @@ -109,13 +109,20 @@ <target name="full-build" depends="full-check, install" description="a full build with svn checkout" /> <target name="needed-check" unless="full-build"> - <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> - <srcfiles dir="extlibs" includes="*" /> + <uptodate property="antlr.notneeded" targetfile="${output.dir}/jarjar.jar"> <srcfiles dir="grammar" includes="*.g" /> </uptodate> - <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar"> - <srcfiles dir="grammar" includes="*.g" /> - </uptodate> + <!-- When antlr.notneeded isn't set, a clean is run after this, so jarjar's running depends + on both that and its own jar --> + <condition property="jarjar.notneeded"> + <and> + <isset property="antlr.notneeded"/> + <uptodate targetfile="${output.dir}/jarjar.jar"> + <srcfiles dir="extlibs" includes="*" /> + <srcfiles dir="grammar" includes="*.g" /> + </uptodate> + </and> + </condition> </target> <target name="init" depends="version-init"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-11-23 19:35:21
|
Revision: 5618 http://jython.svn.sourceforge.net/jython/?rev=5618&view=rev Author: pjenvey Date: 2008-11-23 19:35:19 +0000 (Sun, 23 Nov 2008) Log Message: ----------- exclude the antlr tests as they don't have any actual tests Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-11-23 15:22:58 UTC (rev 5617) +++ trunk/jython/build.xml 2008-11-23 19:35:19 UTC (rev 5618) @@ -769,6 +769,7 @@ <fileset dir="${test.source.dir}" includes="**/*Test*.java"> <exclude name="javatests/**/*" /> <exclude name="**/InterpTestCase.java" /> + <exclude name="org/python/antlr/**" /> </fileset> </batchtest> </junit> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-11-23 21:56:27
|
Revision: 5620 http://jython.svn.sourceforge.net/jython/?rev=5620&view=rev Author: pjenvey Date: 2008-11-23 21:56:25 +0000 (Sun, 23 Nov 2008) Log Message: ----------- turn on javatest/regrtest junit xml output by default, to dist/testreports Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-11-23 20:58:25 UTC (rev 5619) +++ trunk/jython/build.xml 2008-11-23 21:56:25 UTC (rev 5620) @@ -152,6 +152,7 @@ <property name="gensrc.dir" value="${output.dir}/gensrc" /> <property name="dist.dir" value="${work.dir}/dist" /> <property name="apidoc.dir" value="${dist.dir}/Doc/javadoc" /> + <property name="junit.reports" value="${dist.dir}/testreports" /> <!-- classpaths --> <path id="main.classpath"> @@ -761,11 +762,17 @@ </jar> </target> - <target name="test" depends="javatest,launchertest,regrtest"/> + <target name="test" depends="prepare-test,javatest,launchertest,regrtest"/> + <target name="prepare-test" depends="init"> + <!-- Clean any old test output --> + <delete dir="${junit.reports}"/> + </target> <target name="javatest" depends="compile,expose"> + <mkdir dir="${junit.reports}"/> <junit fork="true" printsummary="true"> + <formatter type="xml"/> <classpath refid="test.classpath"/> - <batchtest todir="${dist.dir}/testreports"> + <batchtest todir="${junit.reports}"> <fileset dir="${test.source.dir}" includes="**/*Test*.java"> <exclude name="javatests/**/*" /> <exclude name="**/InterpTestCase.java" /> @@ -787,6 +794,8 @@ <arg value="${dist.dir}/Lib/test/regrtest.py"/> <!-- Only run the tests that are expected to work on Jython --> <arg value="--expected"/> + <arg value="-j"/> + <arg value="${junit.reports}"/> </exec> </target> <target name="regrtest-windows" if="os.family.windows"> @@ -795,6 +804,8 @@ <arg value="${dist.dir}/Lib/test/regrtest.py"/> <!-- Only run the tests that are expected to work on Jython --> <arg value="--expected"/> + <arg value="-j"/> + <arg value="${junit.reports}"/> </exec> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-12-06 22:20:10
|
Revision: 5717 http://jython.svn.sourceforge.net/jython/?rev=5717&view=rev Author: otmarhumbel Date: 2008-12-06 22:14:43 +0000 (Sat, 06 Dec 2008) Log Message: ----------- javac ignores the optimize option, according to http://ant.apache.org/manual/ Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-12-06 21:44:53 UTC (rev 5716) +++ trunk/jython/build.xml 2008-12-06 22:14:43 UTC (rev 5717) @@ -58,7 +58,6 @@ #build.compiler=modern #jdk.target.version=1.5 #debug=false -#optimize=off #deprecation=off # - the svn main directory to build from; only needed for full-build @@ -418,7 +417,6 @@ target="${jdk.target.version}" source="${jdk.source.version}" debug="${debug}" - optimize="${optimize}" deprecation="${deprecation}" nowarn="${nowarn}"> <include name="org/python/util/TemplateAntTask.java" /> @@ -476,7 +474,6 @@ target="${jdk.target.version}" source="${jdk.source.version}" debug="${debug}" - optimize="${optimize}" deprecation="${deprecation}" nowarn="${nowarn}"/> @@ -486,7 +483,6 @@ target="${jdk.target.version}" source="${jdk.source.version}" debug="${debug}" - optimize="${optimize}" deprecation="${deprecation}" nowarn="${nowarn}"> <classpath refid="test.classpath" /> @@ -555,7 +551,6 @@ <attribute name="build-compiler" value="${build.compiler}" /> <attribute name="jdk-target-version" value="${jdk.target.version}" /> <attribute name="debug" value="${debug}" /> - <attribute name="optimize" value="${optimize}" /> </section> </manifest> </jar> @@ -588,7 +583,6 @@ <attribute name="build-compiler" value="${build.compiler}" /> <attribute name="jdk-target-version" value="${jdk.target.version}" /> <attribute name="debug" value="${debug}" /> - <attribute name="optimize" value="${optimize}" /> </section> </manifest> </jar> @@ -718,7 +712,6 @@ target="${jdk.target.version}" source="${jdk.source.version}" debug="${debug}" - optimize="${optimize}" deprecation="${deprecation}" nowarn="${nowarn}" /> @@ -757,7 +750,6 @@ <attribute name="build-compiler" value="${build.compiler}" /> <attribute name="jdk-target-version" value="${jdk.target.version}" /> <attribute name="debug" value="${debug}" /> - <attribute name="optimize" value="${optimize}" /> </section> </manifest> </jar> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-12-06 22:22:13
|
Revision: 5716 http://jython.svn.sourceforge.net/jython/?rev=5716&view=rev Author: otmarhumbel Date: 2008-12-06 21:44:53 +0000 (Sat, 06 Dec 2008) Log Message: ----------- fork the biggest javac task this hopefully enables hudson's build Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-12-06 15:00:08 UTC (rev 5715) +++ trunk/jython/build.xml 2008-12-06 21:44:53 UTC (rev 5716) @@ -460,7 +460,8 @@ source="${jdk.source.version}" debug="${debug}" deprecation="${deprecation}" - nowarn="${nowarn}"> + nowarn="${nowarn}" + fork="yes"> <src path="${source.dir}"/> <src path="${gensrc.dir}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nr...@us...> - 2008-12-06 22:50:24
|
Revision: 5718 http://jython.svn.sourceforge.net/jython/?rev=5718&view=rev Author: nriley Date: 2008-12-06 22:50:19 +0000 (Sat, 06 Dec 2008) Log Message: ----------- Java 6 javac on Mac OS X requires more memory to compile Jython Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-12-06 22:14:43 UTC (rev 5717) +++ trunk/jython/build.xml 2008-12-06 22:50:19 UTC (rev 5718) @@ -459,7 +459,8 @@ debug="${debug}" deprecation="${deprecation}" nowarn="${nowarn}" - fork="yes"> + memoryMaximumSize="128m" + fork="true"> <src path="${source.dir}"/> <src path="${gensrc.dir}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nr...@us...> - 2008-12-07 06:35:13
|
Revision: 5720 http://jython.svn.sourceforge.net/jython/?rev=5720&view=rev Author: nriley Date: 2008-12-07 06:35:04 +0000 (Sun, 07 Dec 2008) Log Message: ----------- Java 6 javac on x64 Linux requires even more memory to compile Jython Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-12-07 04:15:26 UTC (rev 5719) +++ trunk/jython/build.xml 2008-12-07 06:35:04 UTC (rev 5720) @@ -459,7 +459,7 @@ debug="${debug}" deprecation="${deprecation}" nowarn="${nowarn}" - memoryMaximumSize="128m" + memoryMaximumSize="192m" fork="true"> <src path="${source.dir}"/> <src path="${gensrc.dir}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-12-17 07:08:01
|
Revision: 5772 http://jython.svn.sourceforge.net/jython/?rev=5772&view=rev Author: pjenvey Date: 2008-12-17 07:07:56 +0000 (Wed, 17 Dec 2008) Log Message: ----------- feed me, Seymour Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-12-17 03:56:56 UTC (rev 5771) +++ trunk/jython/build.xml 2008-12-17 07:07:56 UTC (rev 5772) @@ -178,9 +178,9 @@ <pathelement path="${exposed.dir}" /> <pathelement path="${compile.dir}" /> </path> - <!-- 64 bit Java 6 needs about 96m for regrtest on most platforms, but Apple's needs - 144m --> - <property name="regrtest.Xmx" value="-Xmx144m" /> + <!-- 64 bit Java 6 needs roughly 96m for regrtest on most platforms, but Apple's needs + more --> + <property name="regrtest.Xmx" value="-Xmx160m" /> </target> <target name="version-init"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-01-06 22:13:44
|
Revision: 5859 http://jython.svn.sourceforge.net/jython/?rev=5859&view=rev Author: otmarhumbel Date: 2009-01-06 21:58:40 +0000 (Tue, 06 Jan 2009) Log Message: ----------- - using ${dist.dir} for both jython.jar and jython-complete.jar - no unjar of jarjar.jar (since it does not exist any more) Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-06 20:57:41 UTC (rev 5858) +++ trunk/jython/build.xml 2009-01-06 21:58:40 UTC (rev 5859) @@ -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="${dest.dir}/jython.jar"> + <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar"> <srcfiles dir="grammar" includes="*.g" /> </uptodate> </target> @@ -507,7 +507,7 @@ <target name="jar-complete" depends="jar"> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/> - <jarjar destfile="${output.dir}/jython-complete.jar"> + <jarjar destfile="${dist.dir}/jython-complete.jar"> <zipfileset src="${dist.dir}/jython.jar"/> <zipfileset src="extlibs/antlr-3.1.1-runtime.jar"/> <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/> @@ -537,11 +537,6 @@ </section> </manifest> </jarjar> - <unjar src="${output.dir}/jarjar.jar" dest="${jarjar.dir}"> - <patternset> - <exclude name="META-INF/**"/> - </patternset> - </unjar> </target> <target name="jar" depends="compile,expose"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-01-07 08:08:07
|
Revision: 5864 http://jython.svn.sourceforge.net/jython/?rev=5864&view=rev Author: otmarhumbel Date: 2009-01-07 08:08:00 +0000 (Wed, 07 Jan 2009) Log Message: ----------- 1) exlude jython.jar from the installation this makes the installer autotests pass again 2) do not include the /Lib files into jython-complete.jar once issue #1214 is fixed, 'java -jar jython-complete.jar' will run for all installation types (for now, set the -Dpython.home variable if not in standalone mode) Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-07 07:35:05 UTC (rev 5863) +++ trunk/jython/build.xml 2009-01-07 08:08:00 UTC (rev 5864) @@ -518,7 +518,6 @@ <rule pattern="org.jruby.ext.posix.**" result="org.python.posix.@1"/> <zipfileset src="extlibs/constantine-0.4.jar"/> <rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/> - <fileset dir="${dist.dir}" includes="Lib/**/*" /> <manifest> <attribute name="Main-Class" value="org.python.util.jython" /> <attribute name="Built-By" value="${user.name}" /> @@ -713,7 +712,11 @@ </fileset> </copy> <echo>building installer .jar file</echo> - <jar destfile="${work.dir}/jython_installer-${jython.version.noplus}.jar" basedir="${dist.dir}" update="true"> + <jar destfile="${work.dir}/jython_installer-${jython.version.noplus}.jar" update="true"> + <fileset dir="${dist.dir}"> + <exclude name="jython.jar"/> + <exclude name="callbacker_test.jar"/> + </fileset> <manifest> <attribute name="Main-Class" value="org.python.util.install.Installation" /> <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: <otm...@us...> - 2009-01-07 08:29:02
|
Revision: 5865 http://jython.svn.sourceforge.net/jython/?rev=5865&view=rev Author: otmarhumbel Date: 2009-01-07 08:28:57 +0000 (Wed, 07 Jan 2009) Log Message: ----------- preparation for an easy rename of the jython .jar files Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-07 08:08:00 UTC (rev 5864) +++ trunk/jython/build.xml 2009-01-07 08:28:57 UTC (rev 5865) @@ -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.jar"> + <uptodate property="antlr.notneeded" targetfile="${dist.dir}/${jython.dev.jar}"> <srcfiles dir="grammar" includes="*.g" /> </uptodate> </target> @@ -172,6 +172,8 @@ <!-- 64 bit Java 6 needs roughly 96m for regrtest on most platforms, but Apple's needs more --> <property name="regrtest.Xmx" value="-Xmx160m" /> + <property name="jython.dev.jar" value="jython.jar" /> + <property name="jython.deploy.jar" value="jython-complete.jar" /> </target> <target name="version-init"> @@ -504,8 +506,8 @@ <target name="jar-complete" depends="jar"> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/> - <jarjar destfile="${dist.dir}/jython-complete.jar"> - <zipfileset src="${dist.dir}/jython.jar"/> + <jarjar destfile="${dist.dir}/${jython.deploy.jar}"> + <zipfileset src="${dist.dir}/${jython.dev.jar}"/> <zipfileset src="extlibs/antlr-3.1.1-runtime.jar"/> <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/> <zipfileset src="extlibs/asm-3.1.jar"/> @@ -545,7 +547,7 @@ <jar destfile="${dist.dir}/callbacker_test.jar"> <fileset dir="${compile.dir}" includes="org/python/tests/Callbacker*"/> </jar> - <jar destfile="${dist.dir}/jython.jar" duplicate="fail"> + <jar destfile="${dist.dir}/${jython.dev.jar}" duplicate="fail"> <nameunion> <fileset dir="${exposed.dir}"/> <fileset dir="${compile.dir}" excludes="org/python/expose/generate/**"/> @@ -714,7 +716,7 @@ <echo>building installer .jar file</echo> <jar destfile="${work.dir}/jython_installer-${jython.version.noplus}.jar" update="true"> <fileset dir="${dist.dir}"> - <exclude name="jython.jar"/> + <exclude name="${jython.dev.jar}"/> <exclude name="callbacker_test.jar"/> </fileset> <manifest> @@ -799,7 +801,7 @@ <target name="bugtest" depends="create-bugtest-config"> <java classname="org.python.util.jython" fork="true" dir="${bugtests.dir}"> <classpath> - <pathelement location="${dist.dir}/jython.jar"/> + <pathelement location="${dist.dir}/${jython.dev.jar}"/> </classpath> <jvmarg value="-Dpython.home=${dist.dir}"/> <arg value="driver.py"/> @@ -828,7 +830,7 @@ # safe to edit by hand (won't be overwritten) java_home="${jdk.home}" jython_home="${dist.dir}" -classpath="${dist.dir}/jython.jar${path.separator}classes" +classpath="${dist.dir}/${jython.dev.jar}${path.separator}classes" </echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-01-09 17:31:13
|
Revision: 5901 http://jython.svn.sourceforge.net/jython/?rev=5901&view=rev Author: otmarhumbel Date: 2009-01-09 17:31:07 +0000 (Fri, 09 Jan 2009) Log Message: ----------- reduce the size of the installer .jar by excluding external libraries we do not want to distribute Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-09 15:16:08 UTC (rev 5900) +++ trunk/jython/build.xml 2009-01-09 17:31:07 UTC (rev 5901) @@ -720,6 +720,15 @@ <fileset dir="${dist.dir}"> <exclude name="${jython.dev.jar}"/> <exclude name="callbacker_test.jar"/> + <exclude name="extlibs/svnant-jars/**" /> + <exclude name="extlibs/antlr*.jar" /> + <exclude name="extlibs/asm*.jar" /> + <exclude name="extlibs/constantine*.jar" /> + <exclude name="extlibs/jarjar*.jar" /> + <exclude name="extlibs/junit*.jar" /> + <exclude name="extlibs/servlet-api*.jar" /> + <exclude name="extlibs/stringtemplate*.jar" /> + <exclude name="extlibs/xerces*.jar" /> </fileset> <manifest> <attribute name="Main-Class" value="org.python.util.install.Installation" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2009-01-09 20:40:16
|
Revision: 5903 http://jython.svn.sourceforge.net/jython/?rev=5903&view=rev Author: fwierzbicki Date: 2009-01-09 20:40:11 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Change release numbers in build. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-09 18:01:13 UTC (rev 5902) +++ trunk/jython/build.xml 2009-01-09 20:40:11 UTC (rev 5903) @@ -187,8 +187,8 @@ <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA --> <!-- The current version info --> - <property name="jython.version" value="2.5b0+"/> - <property name="jython.version.noplus" value="2.5b0"/> + <property name="jython.version" value="2.5b1+"/> + <property name="jython.version.noplus" value="2.5b1"/> <property name="jython.major_version" value="2"/> <property name="jython.minor_version" value="5"/> <property name="jython.micro_version" value="0"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-01-19 22:23:18
|
Revision: 5947 http://jython.svn.sourceforge.net/jython/?rev=5947&view=rev Author: otmarhumbel Date: 2009-01-19 21:43:36 +0000 (Mon, 19 Jan 2009) Log Message: ----------- add xercesImpl as zipfileset to jarjar again: without this, there are no org.python.apache.* packages in jython.jar Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-18 13:46:12 UTC (rev 5946) +++ trunk/jython/build.xml 2009-01-19 21:43:36 UTC (rev 5947) @@ -522,6 +522,7 @@ <rule pattern="org.jruby.ext.posix.**" result="org.python.posix.@1"/> <zipfileset src="extlibs/constantine-0.4.jar"/> <rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/> + <zipfileset src="extlibs/xercesImpl-2.9.1.jar"/> <rule pattern="org.apache.xml.**" result="org.python.apache.xml.@1"/> <rule pattern="org.apache.xerces.**" result="org.python.apache.xerces.@1"/> <rule pattern="org.apache.wml.**" result="org.python.apache.wml.@1"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2009-01-24 20:17:43
|
Revision: 5973 http://jython.svn.sourceforge.net/jython/?rev=5973&view=rev Author: cgroves Date: 2009-01-24 20:17:39 +0000 (Sat, 24 Jan 2009) Log Message: ----------- Exclude the xerces service declaration as our jarjar'd version doesn't match the names in the declaration Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-01-24 20:11:54 UTC (rev 5972) +++ trunk/jython/build.xml 2009-01-24 20:17:39 UTC (rev 5973) @@ -532,7 +532,7 @@ <rule pattern="org.jruby.ext.posix.**" result="org.python.posix.@1"/> <zipfileset src="extlibs/constantine-0.4.jar"/> <rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/> - <zipfileset src="extlibs/xercesImpl-2.9.1.jar"/> + <zipfileset src="extlibs/xercesImpl-2.9.1.jar" excludes="META-INF/services/*"/> <rule pattern="org.apache.xml.**" result="org.python.apache.xml.@1"/> <rule pattern="org.apache.xerces.**" result="org.python.apache.xerces.@1"/> <rule pattern="org.apache.wml.**" result="org.python.apache.wml.@1"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2009-02-15 23:27:48
|
Revision: 6035 http://jython.svn.sourceforge.net/jython/?rev=6035&view=rev Author: pjenvey Date: 2009-02-15 23:27:44 +0000 (Sun, 15 Feb 2009) Log Message: ----------- double antlr's conversiontimeout for slower environments, in particular the hudson buildot Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2009-02-15 18:35:41 UTC (rev 6034) +++ trunk/jython/build.xml 2009-02-15 23:27:44 UTC (rev 6035) @@ -426,6 +426,8 @@ <target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded"> <java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}"> + <arg value="-Xconversiontimeout"/> + <arg value="2000"/> <arg value="-fo"/> <arg path="${work.dir}/build/gensrc/org/python/antlr"/> <arg value="-lib"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |