Menu
▾
▴
jython-checkins
|
From: <nr...@us...> - 2008-07-18 20:40:19
|
Revision: 4970
http://jython.svn.sourceforge.net/jython/?rev=4970&view=rev
Author: nriley
Date: 2008-07-18 20:40:17 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Make ant regrtest work on Windows again.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-07-18 19:21:37 UTC (rev 4969)
+++ branches/asm/build.xml 2008-07-18 20:40:17 UTC (rev 4970)
@@ -201,6 +201,15 @@
<condition property="os.family.unix">
<os family="unix"/>
</condition>
+ <condition property="os.family.windows">
+ <os family="windows"/>
+ </condition>
+ <condition property="os.unix-or-cygwin">
+ <or>
+ <os family="unix"/>
+ <equals arg1="${OSNAME}" arg2="cygwin"/>
+ </or>
+ </condition>
</target>
<target name="full-preinit">
@@ -728,13 +737,21 @@
<arg value="${dist.dir}"/>
</exec>
</target>
- <target name="regrtest" depends="developer-build">
+ <target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
+ <target name="regrtest-unix" if="os.unix-or-cygwin">
<exec executable="${dist.dir}/bin/jython">
<arg value="${dist.dir}/Lib/test/regrtest.py"/>
<!-- Only run the tests that are expected to work on Jython -->
<arg value="--expected"/>
</exec>
</target>
+ <target name="regrtest-windows" if="os.windows" unless="os.unix-or-cygwin">
+ <exec executable="${dist.dir}/bin/jython.bat">
+ <arg value="${dist.dir}/Lib/test/regrtest.py"/>
+ <!-- Only run the tests that are expected to work on Jython -->
+ <arg value="--expected"/>
+ </exec>
+ </target>
<!-- run bugtests, create a config if necessary -->
<target name="bugtest" depends="create-bugtest-config">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nr...@us...> - 2008-07-18 20:51:02
|
Revision: 4971
http://jython.svn.sourceforge.net/jython/?rev=4971&view=rev
Author: nriley
Date: 2008-07-18 20:51:00 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
Conditionalize launcher test; no need for Cygwin test.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-07-18 20:40:17 UTC (rev 4970)
+++ branches/asm/build.xml 2008-07-18 20:51:00 UTC (rev 4971)
@@ -204,12 +204,6 @@
<condition property="os.family.windows">
<os family="windows"/>
</condition>
- <condition property="os.unix-or-cygwin">
- <or>
- <os family="unix"/>
- <equals arg1="${OSNAME}" arg2="cygwin"/>
- </or>
- </condition>
</target>
<target name="full-preinit">
@@ -732,20 +726,20 @@
</batchtest>
</junit>
</target>
- <target name="launchertest" depends="developer-build">
+ <target name="launchertest" depends="developer-build" if="os.family.unix">
<exec executable="${test.shell.dir}/test-jython.sh">
<arg value="${dist.dir}"/>
</exec>
</target>
<target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
- <target name="regrtest-unix" if="os.unix-or-cygwin">
+ <target name="regrtest-unix" if="os.family.unix">
<exec executable="${dist.dir}/bin/jython">
<arg value="${dist.dir}/Lib/test/regrtest.py"/>
<!-- Only run the tests that are expected to work on Jython -->
<arg value="--expected"/>
</exec>
</target>
- <target name="regrtest-windows" if="os.windows" unless="os.unix-or-cygwin">
+ <target name="regrtest-windows" if="os.family.windows">
<exec executable="${dist.dir}/bin/jython.bat">
<arg value="${dist.dir}/Lib/test/regrtest.py"/>
<!-- Only run the tests that are expected to work on Jython -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nr...@us...> - 2008-07-19 05:54:22
|
Revision: 4973
http://jython.svn.sourceforge.net/jython/?rev=4973&view=rev
Author: nriley
Date: 2008-07-19 05:54:20 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
Clean up install targets; allow install to be run without full-build; normalize source directory structure between checked-out and installed versions.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-07-19 05:49:11 UTC (rev 4972)
+++ branches/asm/build.xml 2008-07-19 05:54:20 UTC (rev 4973)
@@ -162,6 +162,7 @@
<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"/>
@@ -268,14 +269,13 @@
<echo>templates.dir = '${templates.dir}'</echo>
<echo>templates.lazy = '${templates.lazy}'</echo>
<echo>python.lib = '${python.lib}'</echo>
- <echo>javaccHome = '${javaccHome}'</echo>
<echo>build.compiler = '${build.compiler}'</echo>
<echo>jdk.target.version = '${jdk.target.version}'</echo>
<echo>jdk.source.version = '${jdk.source.version}'</echo>
<echo>deprecation = '${deprecation}'</echo>
<echo>debug = '${debug}'</echo>
<echo>nowarn = '${nowarn}'</echo>
- <echo>--- properties (used for full-build only ) ---</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>
@@ -438,7 +438,7 @@
</target>
- <target name="compile" depends="init,antlr_gen,copy-antlr,jarjar,brand-version">
+ <target name="compile" depends="init,antlr_gen,jarjar,brand-version">
<javac destdir="${compile.dir}"
target="${jdk.target.version}"
source="${jdk.source.version}"
@@ -585,13 +585,12 @@
</javadoc>
</target>
- <target name="copy-antlr" if="full-build">
- <copy todir="${dist.dir}/src/java" preservelastmodified="true">
- <fileset dir="${gensrc.dir}" />
- </copy>
+ <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" />
</target>
- <target name="copy-full" depends="copy-lib" if="full-build">
+ <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">
<fileset dir="${jython.base.dir}"
@@ -599,18 +598,20 @@
/>
</copy>
- <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" />
-
<!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
<echo>copy sources from ${jython.base.dir}</echo>
- <copy todir="${dist.dir}/src/java" preservelastmodified="true">
+ <copy todir="${dist.dir}" preservelastmodified="true">
<fileset dir="${jython.base.dir}">
<include name="src/**/*.java" />
<include name="src/com/**/*.properties" />
+ <include name="src/shell/*" />
+ <include name="src/templates/*" />
<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="src/org/**/ucnhash.dat" />
+ <include name="CoreExposed.includes" />
</fileset>
</copy>
@@ -629,19 +630,17 @@
</copy>
</target>
- <target name="copy-lib" depends="init">
+ <target name="copy-lib" depends="init, copy-javalib, copy-cpythonlib">
+ <!-- XXX untested and most likely broken in 2.5
<copy todir="${dist.dir}" preservelastmodified="true">
<fileset dir="${jython.base.dir}" includes="Tools/**/*.py" />
</copy>
+ -->
<copy todir="${dist.dir}/Lib">
<fileset dir="${jython.base.dir}/Lib">
<exclude name="**/*.class"/>
</fileset>
- <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. -->
- <present present="srconly" targetdir="${jython.base.dir}/Lib"/>
- </fileset>
</copy>
<copy todir="${dist.dir}/bin">
@@ -652,6 +651,18 @@
<fileset dir="${dist.dir}/bin" />
</chmod>
+ </target>
+
+ <target name="copy-cpythonlib" if="cpythonlib.present">
+ <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. -->
+ <present present="srconly" targetdir="${jython.base.dir}/Lib"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="copy-javalib" unless="full-build">
<copy todir="${dist.dir}/javalib">
<fileset dir="${jython.base.dir}/extlibs">
<exclude name="profile.properties"/>
@@ -663,8 +674,14 @@
</copy>
</target>
+ <!-- if install called by itself, make sure all the dependent targets run;
+ otherwise, redundant with full-check -->
+ <target name="install-init">
+ <property name="full-build" value="true" />
+ </target>
+
<!-- wrap the build into the installer -->
- <target name="install" depends="brand-readme-version, jar-complete, javadoc, copy-full">
+ <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" />
<echo>compiling installer from ${install.src.dir}</echo>
<javac srcdir="${install.src.dir}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-06 11:59:38
|
Revision: 5091
http://jython.svn.sourceforge.net/jython/?rev=5091&view=rev
Author: fwierzbicki
Date: 2008-08-06 11:59:35 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
call clean if grammars change. Really only needed when *tokens* change,
but token changes break things so subtly, and so few work on the grammars
anyway, that this is the way to go I think.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-08-06 02:48:46 UTC (rev 5090)
+++ branches/asm/build.xml 2008-08-06 11:59:35 UTC (rev 5091)
@@ -313,8 +313,18 @@
</delete>
</target>
+ <target name="clean-if-antlr-needed" unless="antlr.notneeded">
+ <!-- this seems to be the only way I could get a clean when there has been a
+ change to grammar files. If you are working on the grammars you might
+ 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"/>
+ </target>
+
+ <target name ="prepare-output" depends="init,needed-check,clean-if-antlr-needed,make-output-dirs"/>
+
<!-- create output directories -->
- <target name ="prepare-output" depends="init">
+ <target name ="make-output-dirs" depends="init">
<mkdir dir="${compile.dir}" />
<mkdir dir="${jarjar.dir}" />
<mkdir dir="${gensrc.dir}/org/python/antlr" />
@@ -415,7 +425,7 @@
lazy="${templates.lazy}"/>
</target>
- <target name="antlr_gen" depends="init,needed-check,prepare-output" unless="antlr.notneeded">
+ <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="-fo"/>
<arg path="${work.dir}/build/gensrc/org/python/antlr"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-06 12:08:19
|
Revision: 5092
http://jython.svn.sourceforge.net/jython/?rev=5092&view=rev
Author: fwierzbicki
Date: 2008-08-06 12:08:16 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
trigger jarjar if grammar changes (since clean is triggered).
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-08-06 11:59:35 UTC (rev 5091)
+++ branches/asm/build.xml 2008-08-06 12:08:16 UTC (rev 5092)
@@ -508,7 +508,7 @@
includesfile="${jython.base.dir}/CoreExposed.includes"/>
</target>
- <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded">
+ <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded,antlr.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.1b2.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-06 18:15:21
|
Revision: 5095
http://jython.svn.sourceforge.net/jython/?rev=5095&view=rev
Author: fwierzbicki
Date: 2008-08-06 18:15:17 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
improved jarjar conditional -- but made build.xml slightly more impenetrable.
Sigh.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-08-06 17:54:07 UTC (rev 5094)
+++ branches/asm/build.xml 2008-08-06 18:15:17 UTC (rev 5095)
@@ -319,6 +319,8 @@
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"/>
@@ -508,7 +510,7 @@
includesfile="${jython.base.dir}/CoreExposed.includes"/>
</target>
- <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded,antlr.notneeded">
+ <target name="jarjar" depends="init,needed-check" if="jarjar.needed" 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.1b2.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-08-08 17:42:10
|
Revision: 5106
http://jython.svn.sourceforge.net/jython/?rev=5106&view=rev
Author: fwierzbicki
Date: 2008-08-08 17:42:06 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
make jarjar run all of the time until I figure out why the conditionals
are not working.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-08-08 15:37:43 UTC (rev 5105)
+++ branches/asm/build.xml 2008-08-08 17:42:06 UTC (rev 5106)
@@ -510,7 +510,10 @@
includesfile="${jython.base.dir}/CoreExposed.includes"/>
</target>
- <target name="jarjar" depends="init,needed-check" if="jarjar.needed" unless="jarjar.notneeded">
+ <!-- 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">
<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.1b2.jar"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nr...@us...> - 2008-08-18 14:46:25
|
Revision: 5197
http://jython.svn.sourceforge.net/jython/?rev=5197&view=rev
Author: nriley
Date: 2008-08-18 14:46:22 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
Run Jython regrtest (on unix) with bytecode verification.
Modified Paths:
--------------
branches/asm/build.xml
Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml 2008-08-18 07:17:46 UTC (rev 5196)
+++ branches/asm/build.xml 2008-08-18 14:46:22 UTC (rev 5197)
@@ -766,6 +766,7 @@
<target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
<target name="regrtest-unix" if="os.family.unix">
<exec executable="${dist.dir}/bin/jython">
+ <arg value="--verify"/>
<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.
|
×
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