From: <cg...@us...> - 2008-01-03 19:02:55
|
Revision: 3959 http://jython.svn.sourceforge.net/jython/?rev=3959&view=rev Author: cgroves Date: 2008-01-03 11:02:53 -0800 (Thu, 03 Jan 2008) Log Message: ----------- Don't include ant's startup classpath as having asm in there confuses the version of asm we're including explicitly Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-01-03 03:58:00 UTC (rev 3958) +++ trunk/jython/build.xml 2008-01-03 19:02:53 UTC (rev 3959) @@ -157,7 +157,6 @@ <pathelement path="${jndi.jar}" /> <pathelement path="${jdbc.jar}" /> <pathelement path="extlibs/asm-3.1.jar" /> - <pathelement path="${java.class.path}" /> </path> <available property="servlet.present" classname="javax.servlet.Servlet" classpath="${servlet.jar}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-01-17 00:28:14
|
Revision: 4044 http://jython.svn.sourceforge.net/jython/?rev=4044&view=rev Author: otmarhumbel Date: 2008-01-16 16:28:09 -0800 (Wed, 16 Jan 2008) Log Message: ----------- fixed full-build, fixed javadoc, removed unused variables jndi.jar and jdbc.jar (classes included in jdk), improved svnant/javahl documentation Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-01-16 23:35:48 UTC (rev 4043) +++ trunk/jython/build.xml 2008-01-17 00:28:09 UTC (rev 4044) @@ -53,8 +53,9 @@ Actions for a release --------------------- - http://wiki.python.org/jython/JythonDeveloperGuide/HowToReleaseJython +See http://wiki.python.org/jython/JythonDeveloperGuide/HowToReleaseJython + An example ant.properties file: ------------------------------- @@ -108,8 +109,11 @@ #svn.revision=3444 # - the directory containing libsvnjavahl-1.dll (on windows) and svnjavahl.jar; only needed for full-build -# how to get these: -# - download http://subversion.tigris.org/files/documents/15/31073/svn-win32-1.3.1_javahl.zip (or newer) +# how to get these (for windows): +# - goto http://subversion.tigris.org/servlets/ProjectDocumentList +# - open the Releases folder +# - click on the Windows folder +# - download svn-win32-1.4.6_javahl.zip (or newer) # - unzip the .dll and .jar into javahl.dir javahl.dir=C:/Programme/Subversion/javahl @@ -121,8 +125,10 @@ # - svnClientAdapter.jar # - svnjavahl.jar # how to get these: -# - download http://subclipse.tigris.org/files/documents/906/23927/svnant-1.0.0-rc1.zip (or newer) -# - unzip the jar files from /lib folder to svnant.jar.dir +# - goto http://subclipse.tigris.org/servlets/ProjectDocumentList +# - click on the the svnant folder +# - download svnant-1.0.0.zip (or newer) +# - unzip the jar files from the /lib folder to svnant.jar.dir svnant.jar.dir=${basedir}/../externals/svnant-jars </echo> </target> @@ -154,8 +160,6 @@ <pathelement path="${oracle.jar}" /> <pathelement path="${mysql.jar}" /> <pathelement path="${postgresql.jar}" /> - <pathelement path="${jndi.jar}" /> - <pathelement path="${jdbc.jar}" /> <pathelement path="extlibs/asm-3.1.jar" /> <pathelement path="extlibs/asm-util-3.1.jar" /> </path> @@ -167,7 +171,7 @@ <available property="mysql.present" classname="org.gjt.mm.mysql.Driver" classpath="${mysql.jar}" /> <available property="postgresql.present" classname="org.postgresql.Driver" classpath="${postgresql.jar}" /> <available property="oracle.present" classname="oracle.jdbc.driver.OracleDriver" classpath="${oracle.jar}" /> - <available property="jndi.present" classname="javax.naming.Context" classpath="${jndi.jar}" /> + <available property="jndi.present" classname="javax.naming.Context" /> <available property="javax.sql.present" classname="javax.sql.DataSource" /> <available property="jdbc30.present" classname="java.sql.ParameterMetaData" /> </target> @@ -179,14 +183,11 @@ <!-- predefined main directory for checkout --> <property name="svn.main.dir" value="trunk" /> + <!-- properties work.dir and jython.base.dir are both defined in init and full-init, but with different settings --> <property name="work.dir" value="${basedir}/../full_build/${svn.main.dir}" /> <property name="svn.checkout.dir" value="${work.dir}/checkout" /> <property name="jython.base.dir" value="${svn.checkout.dir}/jython" /> - <property name="source.dir" value="${jython.base.dir}/src" /> - <property name="templates.dir" value="${source.dir}/templates" /> - <property name="bugtests.dir" value="${jython.base.dir}/bugtests" /> <property name="has.repositories.connection" value="true" /> - <property name="python.lib" value="${jython.base.dir}/CPythonLib" /> <property name="python.exe" value="${python.home}/python" /> <condition property="do.checkout" value="true"> <istrue value="${has.repositories.connection}" /> @@ -222,15 +223,15 @@ </target> <target name="init" depends="common-init"> + <!-- properties work.dir and jython.base.dir are both defined in init and full-init, but with different settings --> <property name="work.dir" value="${basedir}" /> - <property name="jython.base.dir" value="${basedir}" /> - <property name="source.dir" value="${basedir}/src" /> - <property name="test.source.dir" value="${basedir}/tests/java" /> - <property name="templates.dir" value="${basedir}/src/templates" /> - <property name="python.lib" value="${basedir}/CPythonLib" /> - <property name="bugtests.dir" value="${basedir}/bugtests" /> + <property name="jython.base.dir" value="${work.dir}" /> + <property name="source.dir" value="${jython.base.dir}/src" /> + <property name="test.source.dir" value="${jython.base.dir}/tests/java" /> + <property name="templates.dir" value="${source.dir}/templates" /> + <property name="python.lib" value="${jython.base.dir}/CPythonLib" /> + <property name="bugtests.dir" value="${jython.base.dir}/bugtests" /> <property name="templates.lazy" value="true" /> - <property name="output.dir" value="${work.dir}/build" /> <property name="compile.dir" value="${output.dir}/classes" /> <property name="exposed.dir" value="${output.dir}/exposed" /> @@ -267,6 +268,8 @@ <echo>source.dir = '${source.dir}'</echo> <echo>parser.dir = '${parser.dir}'</echo> <echo>output.dir = '${output.dir}'</echo> + <echo>compile.dir = '${compile.dir}'</echo> + <echo>exposed.dir = '${exposed.dir}'</echo> <echo>dist.dir = '${dist.dir}'</echo> <echo>apidoc.dir = '${apidoc.dir}'</echo> <echo>templates.dir = '${templates.dir}'</echo> @@ -347,7 +350,7 @@ <!-- checkout cpython license from the correct python maintenance branch --> <svn javahl="${javahl.dir}" > - <checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" /> + <checkout url="http://svn.python.org/projects/python/branches/release23-maint/" destPath="${svn.checkout.dir}/python" recurse="false" /> </svn> </target> @@ -523,7 +526,11 @@ </target> <target name="javadoc" depends="compile"> - <javadoc sourcepath="${source.dir}" + <path id="javadoc.classpath"> + <pathelement path="${java.class.path}" /> + <path refid="main.classpath" /> + </path> + <javadoc sourcepath="${source.dir}" destdir="${apidoc.dir}" source="${jdk.source.version}" public="true" @@ -532,7 +539,7 @@ windowtitle="Jython API documentation" bottom="<a href='http://www.jython.org' target='_top'>Jython homepage</a>" > - <classpath refid="main.classpath" /> + <classpath refid="javadoc.classpath" /> </javadoc> </target> @@ -593,7 +600,7 @@ </target> <!-- wrap the build into the installer --> - <target name="install" depends="version, doc, javadoc, jar, copy-full"> + <target name="install" depends="version, doc, jar, javadoc, copy-full"> <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}" @@ -690,17 +697,17 @@ <!-- create support_config.py in the bugtset directory only if it doesn't already exist --> <target name="create-bugtest-config" depends="init, check-bugtest-config" unless="have_bugtest_config"> - <!-- doesn't seem to be a direct way to get at the path to javac, - java.home points to the jre folder. The following assumes a standard - jdk layout. Alternative is to try something like: + <!-- doesn't seem to be a direct way to get at the path to javac, + java.home points to the jre folder. The following assumes a standard + jdk layout. Alternative is to try something like: <property environment="env"/> <property name="jdk.home" value="${env.JAVA_HOME}" /> - or set jdk.home explicitly - --> - <echo>creating ${bugtests.dir}/support_config.py</echo> - <property name="jdk.home" value="${java.home}/.." /> + or set jdk.home explicitly + --> + <echo>creating ${bugtests.dir}/support_config.py</echo> + <property name="jdk.home" value="${java.home}/.." /> <echo file="${bugtests.dir}/support_config.py"> # this configuration was auto-generated by ant build script, # safe to edit by hand (won't be overwritten) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2008-02-17 02:07:49
|
Revision: 4140 http://jython.svn.sourceforge.net/jython/?rev=4140&view=rev Author: cgroves Date: 2008-02-16 18:07:46 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Only jarjar if the underlying jars have changed so we don't update jython.jar if nothing has changed Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-02-17 01:12:16 UTC (rev 4139) +++ trunk/jython/build.xml 2008-02-17 02:07:46 UTC (rev 4140) @@ -234,6 +234,7 @@ <property name="templates.lazy" value="true" /> <property name="output.dir" value="${work.dir}/build" /> <property name="compile.dir" value="${output.dir}/classes" /> + <property name="jarjar.dir" value="${output.dir}/jarjar" /> <property name="exposed.dir" value="${output.dir}/exposed" /> <property name="dist.dir" value="${work.dir}/dist" /> <property name="apidoc.dir" value="${dist.dir}/Doc/javadoc" /> @@ -245,6 +246,7 @@ <pathelement path="${exposed.dir}" /> <pathelement path="${compile.dir}" /> </path> + <uptodate property="jarjar.notneeded" srcfile="extlibs/asm-3.1.jar" targetfile="${output.dir}/jarjar.jar"/> </target> <target name="dump-env" depends="init"> @@ -324,6 +326,7 @@ <target name ="prepare-output" depends="init"> <mkdir dir="${compile.dir}" /> <mkdir dir="${exposed.dir}" /> + <mkdir dir="${jarjar.dir}" /> <mkdir dir="${dist.dir}" /> </target> @@ -474,16 +477,22 @@ destdir="${exposed.dir}" includesfile="${jython.base.dir}/CoreExposed.includes"/> </target> + <target name="jarjar" depends="init" 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/asm-3.1.jar"/> + <zipfileset src="extlibs/asm-commons-3.1.jar"/> + <zipfileset src="extlibs/asm-util-3.1.jar"/> + <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/> + </jarjar> + <unjar src="${output.dir}/jarjar.jar" dest="${jarjar.dir}"/> + </target> - <target name="jar" depends="compile,expose"> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/> - <jarjar destfile="${dist.dir}/jython.jar"> + <target name="jar" depends="compile,expose,jarjar"> + <jar destfile="${dist.dir}/jython.jar"> <fileset dir="${compile.dir}"/> <fileset dir="${exposed.dir}"/> - <zipfileset src="extlibs/asm-3.1.jar"/> - <zipfileset src="extlibs/asm-commons-3.1.jar"/> - <zipfileset src="extlibs/asm-util-3.1.jar"/> - <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/> + <fileset dir="${jarjar.dir}"/> <manifest> <attribute name="Main-Class" value="org.python.util.jython" /> <attribute name="Built-By" value="${user.name}" /> @@ -507,7 +516,7 @@ <attribute name="optimize" value="${optimize}" /> </section> </manifest> - </jarjar> + </jar> </target> <!-- build the .html files using the ht2html tool --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2008-02-17 02:09:58
|
Revision: 4141 http://jython.svn.sourceforge.net/jython/?rev=4141&view=rev Author: cgroves Date: 2008-02-16 18:09:56 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Actually include all the asm jars in checking if jarjar needs to run Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-02-17 02:07:46 UTC (rev 4140) +++ trunk/jython/build.xml 2008-02-17 02:09:56 UTC (rev 4141) @@ -246,7 +246,9 @@ <pathelement path="${exposed.dir}" /> <pathelement path="${compile.dir}" /> </path> - <uptodate property="jarjar.notneeded" srcfile="extlibs/asm-3.1.jar" targetfile="${output.dir}/jarjar.jar"/> + <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> + <srcfiles dir="extlibs" includes="*" /> + </uptodate> </target> <target name="dump-env" depends="init"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2008-03-14 15:21:48
|
Revision: 4200 http://jython.svn.sourceforge.net/jython/?rev=4200&view=rev Author: cgroves Date: 2008-03-14 08:21:46 -0700 (Fri, 14 Mar 2008) Log Message: ----------- Reorganize init targets so the full build specific initting just sets the properties it wants to override for regular initting and then shares the rest of the init. Make a separate jarjar dir so I can depend on the same jarjar'd files from Eclipse as I do in ant. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-03-11 00:15:02 UTC (rev 4199) +++ trunk/jython/build.xml 2008-03-14 15:21:46 UTC (rev 4200) @@ -124,10 +124,9 @@ <target name="developer-build" depends="prepare-output, jar, copy-lib" description="a local build for developers" /> - <target name="full-build" depends="full-init, dump-env, install" description="a full build with svn checkout" /> + <target name="full-build" depends="full-check, install" description="a full build with svn checkout" /> - <!-- this target should only set properties common to both developer and full build --> - <target name="common-init"> + <target name="init"> <property file="${user.home}/ant.properties" /> <property file="${basedir}/ant.properties" /> @@ -138,29 +137,64 @@ <property name="debug" value="true" /> <property name="nowarn" value="false" /> + <!-- properties work.dir and jython.base.dir are also defined in full-preinit --> + <property name="work.dir" value="${basedir}" /> + <property name="jython.base.dir" value="${work.dir}" /> + + <property name="source.dir" value="${jython.base.dir}/src" /> + <property name="test.source.dir" value="${jython.base.dir}/tests/java" /> + <property name="templates.dir" value="${source.dir}/templates" /> + <property name="python.lib" value="${jython.base.dir}/CPythonLib" /> + <property name="bugtests.dir" value="${jython.base.dir}/bugtests" /> + <property name="templates.lazy" value="true" /> + <property name="extlibs.dir" value="${jython.base.dir}/extlibs" /> + <property name="output.dir" value="${work.dir}/build" /> + <property name="compile.dir" value="${output.dir}/classes" /> + <property name="jarjar.dir" value="${output.dir}/jarjar" /> + <property name="exposed.dir" value="${output.dir}/exposed" /> + <property name="dist.dir" value="${work.dir}/dist" /> + <property name="apidoc.dir" value="${dist.dir}/Doc/javadoc" /> + <property name="parser.dir" value="${source.dir}/org/python/parser" /> + <!-- classpaths --> <path id="main.classpath"> - <pathelement path="extlibs/libreadline-java-0.8.jar" /> - <pathelement path="extlibs/jline-0.9.94.jar" /> - <pathelement path="extlibs/servlet-api-2.5.jar" /> + <pathelement path="${jarjar.dir}" /> + <pathelement path="${extlibs.dir}/libreadline-java-0.8.jar" /> + <pathelement path="${extlibs.dir}/jline-0.9.94.jar" /> + <pathelement path="${extlibs.dir}/servlet-api-2.5.jar" /> <pathelement path="${informix.jar}" /> <pathelement path="${oracle.jar}" /> - <pathelement path="extlibs/mysql-connector-java-5.1.6.jar" /> - <pathelement path="extlibs/postgresql-8.3-603.jdbc4.jar" /> + <pathelement path="${extlibs.dir}/mysql-connector-java-5.1.6.jar" /> + <pathelement path="${extlibs.dir}/postgresql-8.3-603.jdbc4.jar" /> </path> <available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" /> <available property="oracle.present" classname="oracle.jdbc.driver.OracleDriver" classpath="${oracle.jar}" /> + + <path id="test.classpath"> + <path refid="main.classpath"/> + <pathelement path="${extlibs.dir}/asm-commons-3.1.jar" /> + <pathelement path="${extlibs.dir}/junit-3.8.2.jar" /> + <pathelement path="${exposed.dir}" /> + <pathelement path="${compile.dir}" /> + </path> + <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> + <srcfiles dir="extlibs" includes="*" /> + </uptodate> </target> - <target name="full-init" depends="common-init"> + <target name="full-preinit"> + <property file="${user.home}/ant.properties" /> + <property file="${basedir}/ant.properties" /> + <!-- use this property to distinguish a full-build from a developer-build --> <property name="full-build" value="true" /> <!-- predefined main directory for checkout --> <property name="svn.main.dir" value="trunk" /> - <!-- properties work.dir and jython.base.dir are both defined in init and full-init, but with different settings --> + <!-- properties work.dir and jython.base.dir are also definied in init, + so full-preinit must run first to work --> <property name="work.dir" value="${basedir}/../full_build/${svn.main.dir}" /> <property name="svn.checkout.dir" value="${work.dir}/checkout" /> <property name="jython.base.dir" value="${svn.checkout.dir}/jython" /> @@ -189,40 +223,12 @@ </path> <!-- taskdef for svn ant task --> <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> + </target> + <target name="full-check" depends="full-preinit, init, dump-env"> <!-- Require all of the optional jars for a full build --> <fail unless="informix.present" message="informix jar not present" /> <fail unless="oracle.present" message="oracle jar not present" /> </target> - - <target name="init" depends="common-init"> - <!-- properties work.dir and jython.base.dir are both defined in init and full-init, but with different settings --> - <property name="work.dir" value="${basedir}" /> - <property name="jython.base.dir" value="${work.dir}" /> - <property name="source.dir" value="${jython.base.dir}/src" /> - <property name="test.source.dir" value="${jython.base.dir}/tests/java" /> - <property name="templates.dir" value="${source.dir}/templates" /> - <property name="python.lib" value="${jython.base.dir}/CPythonLib" /> - <property name="bugtests.dir" value="${jython.base.dir}/bugtests" /> - <property name="templates.lazy" value="true" /> - <property name="output.dir" value="${work.dir}/build" /> - <property name="compile.dir" value="${output.dir}/classes" /> - <property name="jarjar.dir" value="${output.dir}/jarjar" /> - <property name="exposed.dir" value="${output.dir}/exposed" /> - <property name="dist.dir" value="${work.dir}/dist" /> - <property name="apidoc.dir" value="${dist.dir}/Doc/javadoc" /> - <property name="parser.dir" value="${source.dir}/org/python/parser" /> - <path id="test.classpath"> - <path refid="main.classpath"/> - <pathelement path="extlibs/asm-commons-3.1.jar" /> - <pathelement path="extlibs/junit-3.8.2.jar" /> - <pathelement path="${exposed.dir}" /> - <pathelement path="${compile.dir}" /> - </path> - <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> - <srcfiles dir="extlibs" includes="*" /> - </uptodate> - </target> - <target name="dump-env" depends="init"> <echo>.</echo> <echo>Build environment for ${ant.project.name}</echo> @@ -291,6 +297,7 @@ <!-- create output directories --> <target name ="prepare-output" depends="init"> <mkdir dir="${compile.dir}" /> + <mkdir dir="${jarjar.dir}" /> <mkdir dir="${exposed.dir}" /> <mkdir dir="${dist.dir}" /> </target> @@ -441,7 +448,11 @@ <zipfileset src="extlibs/asm-util-3.1.jar"/> <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/> </jarjar> - <unjar src="${output.dir}/jarjar.jar" dest="${compile.dir}"/> + <unjar src="${output.dir}/jarjar.jar" dest="${jarjar.dir}"> + <patternset> + <exclude name="META-INF/**"/> + </patternset> + </unjar> </target> <target name="jar" depends="compile,expose,jarjar"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-05-30 05:50:42
|
Revision: 4488 http://jython.svn.sourceforge.net/jython/?rev=4488&view=rev Author: pjenvey Date: 2008-05-29 22:50:34 -0700 (Thu, 29 May 2008) Log Message: ----------- invoke regrtest via the new dist/bin/jython script Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-05-30 03:28:32 UTC (rev 4487) +++ trunk/jython/build.xml 2008-05-30 05:50:34 UTC (rev 4488) @@ -686,13 +686,11 @@ </junit> </target> <target name="regrtest" depends="compile,expose,copy-lib"> - <java classname="org.python.util.jython" fork="true"> - <jvmarg value="-Dpython.home=${dist.dir}"/> - <arg value="${dist.dir}/Lib/test/regrtest.py"/> - <!-- Only run the tests that are expected to work on Jython --> - <arg value="--expected"/> - <classpath refid="test.classpath" /> - </java> + <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> <!-- run bugtests, create a config if necessary --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-06-07 22:58:21
|
Revision: 4557 http://jython.svn.sourceforge.net/jython/?rev=4557&view=rev Author: pjenvey Date: 2008-06-07 15:58:19 -0700 (Sat, 07 Jun 2008) Log Message: ----------- not everyone's ant is supporting propertyfile out of the box, use echo instead Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-07 22:51:14 UTC (rev 4556) +++ trunk/jython/build.xml 2008-06-07 22:58:19 UTC (rev 4557) @@ -356,14 +356,29 @@ </target> <target name="brand-version" depends="version-init"> - <exec executable="svnversion" osfamily="unix" outputproperty="build.svn.version"/> + <tstamp> + <format property="build.date" pattern="MMM d yyyy" offset="0"/> + <format property="build.time" pattern="HH:mm:ss" offset="0"/> + </tstamp> + <exec executable="svnversion" osfamily="unix" outputproperty="build.svn.revision"/> <!-- XXX: could attempt to utilize subwcrev.exe to get the revision on Windows --> - <condition property="build.svn.version" value=""> + <condition property="build.svn.revision" value=""> <not> <os family="unix"/> </not> </condition> <property name="version.properties" value="${compile.dir}/org/python/version.properties"/> + <echo file="${version.properties}"># Jython version information +jython.version=${jython.version} +jython.major_version=${jython.major_version} +jython.minor_version=${jython.minor_version} +jython.micro_version=${jython.micro_version} +jython.release_level=${jython.release_level} +jython.release_serial=${jython.release_serial} +jython.build.date=${build.date} +jython.build.time=${build.time} +jython.build.svn_revision=${build.svn.revision}</echo> + <!-- <touch file="${version.properties}" mkdirs="true"/> <propertyfile file="${version.properties}" comment="Jython version information"> @@ -375,8 +390,9 @@ <entry key="jython.release_serial" value="${jython.release_serial}"/> <entry key="jython.build.date" type="date" value="now" pattern="MMM d yyyy"/> <entry key="jython.build.time" type="date" value="now" pattern="HH:mm:ss"/> - <entry key="jython.build.svn_revision" value="${build.svn.version}"/> + <entry key="jython.build.svn_revision" value="${build.svn.revision}"/> </propertyfile> + --> </target> <target name="brand-readme-version" depends="checkout" if="do.snapshot.build"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-06-07 23:04:37
|
Revision: 4558 http://jython.svn.sourceforge.net/jython/?rev=4558&view=rev Author: pjenvey Date: 2008-06-07 16:04:34 -0700 (Sat, 07 Jun 2008) Log Message: ----------- woops, ensure the dir first. thanks Ariane Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-07 22:58:19 UTC (rev 4557) +++ trunk/jython/build.xml 2008-06-07 23:04:34 UTC (rev 4558) @@ -368,6 +368,7 @@ </not> </condition> <property name="version.properties" value="${compile.dir}/org/python/version.properties"/> + <mkdir dir="${compile.dir}/org/python"/> <echo file="${version.properties}"># Jython version information jython.version=${jython.version} jython.major_version=${jython.major_version} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-06-08 21:34:16
|
Revision: 4570 http://jython.svn.sourceforge.net/jython/?rev=4570&view=rev Author: pjenvey Date: 2008-06-08 14:34:14 -0700 (Sun, 08 Jun 2008) Log Message: ----------- o don't break the build if svnversion isn't found on unix o workaround the lack of osfamily in exec in ant 1.6 Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-08 21:03:57 UTC (rev 4569) +++ trunk/jython/build.xml 2008-06-08 21:34:14 UTC (rev 4570) @@ -215,6 +215,9 @@ <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> </target> <target name="full-preinit"> @@ -355,21 +358,23 @@ </svn> </target> - <target name="brand-version" depends="version-init"> - <tstamp> - <format property="build.date" pattern="MMM d yyyy" offset="0"/> - <format property="build.time" pattern="HH:mm:ss" offset="0"/> - </tstamp> - <exec executable="svnversion" osfamily="unix" outputproperty="build.svn.revision"/> - <!-- XXX: could attempt to utilize subwcrev.exe to get the revision on Windows --> + <!-- XXX: could attempt to utilize subwcrev.exe to get the revision on Windows --> + <target name="svnversion" unless="${os.family.unix}"> + <exec executable="svnversion" failifexecutionfails="false" outputproperty="build.svn.revision"/> + </target> + + <target name="brand-version" depends="version-init, svnversion"> <condition property="build.svn.revision" value=""> <not> - <os family="unix"/> + <isset property="build.svn.revision"/> </not> </condition> - <property name="version.properties" value="${compile.dir}/org/python/version.properties"/> + <tstamp> + <format property="build.date" pattern="MMM d yyyy" offset="0"/> + <format property="build.time" pattern="HH:mm:ss" offset="0"/> + </tstamp> <mkdir dir="${compile.dir}/org/python"/> - <echo file="${version.properties}"># Jython version information + <echo file="${compile.dir}/org/python/version.properties"># Jython version information jython.version=${jython.version} jython.major_version=${jython.major_version} jython.minor_version=${jython.minor_version} @@ -379,21 +384,6 @@ jython.build.date=${build.date} jython.build.time=${build.time} jython.build.svn_revision=${build.svn.revision}</echo> - <!-- - <touch file="${version.properties}" mkdirs="true"/> - <propertyfile file="${version.properties}" - comment="Jython version information"> - <entry key="jython.version" value="${jython.version}"/> - <entry key="jython.major_version" value="${jython.major_version}"/> - <entry key="jython.minor_version" value="${jython.minor_version}"/> - <entry key="jython.micro_version" value="${jython.micro_version}"/> - <entry key="jython.release_level" value="${jython.real_release_level}"/> - <entry key="jython.release_serial" value="${jython.release_serial}"/> - <entry key="jython.build.date" type="date" value="now" pattern="MMM d yyyy"/> - <entry key="jython.build.time" type="date" value="now" pattern="HH:mm:ss"/> - <entry key="jython.build.svn_revision" value="${build.svn.revision}"/> - </propertyfile> - --> </target> <target name="brand-readme-version" depends="checkout" if="do.snapshot.build"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2008-06-08 21:44:43
|
Revision: 4571 http://jython.svn.sourceforge.net/jython/?rev=4571&view=rev Author: pjenvey Date: 2008-06-08 14:44:41 -0700 (Sun, 08 Jun 2008) Log Message: ----------- only svnversion on unix Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-08 21:34:14 UTC (rev 4570) +++ trunk/jython/build.xml 2008-06-08 21:44:41 UTC (rev 4571) @@ -359,7 +359,7 @@ </target> <!-- XXX: could attempt to utilize subwcrev.exe to get the revision on Windows --> - <target name="svnversion" unless="${os.family.unix}"> + <target name="svnversion" if="os.family.unix"> <exec executable="svnversion" failifexecutionfails="false" outputproperty="build.svn.revision"/> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nr...@us...> - 2008-06-09 02:39:55
|
Revision: 4580 http://jython.svn.sourceforge.net/jython/?rev=4580&view=rev Author: nriley Date: 2008-06-08 19:39:54 -0700 (Sun, 08 Jun 2008) Log Message: ----------- fix regrtest ant target dependencies so it works from clean Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-09 02:39:10 UTC (rev 4579) +++ trunk/jython/build.xml 2008-06-09 02:39:54 UTC (rev 4580) @@ -726,7 +726,7 @@ </batchtest> </junit> </target> - <target name="regrtest" depends="compile,expose,copy-lib"> + <target name="regrtest" depends="developer-build"> <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 --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nr...@us...> - 2008-06-20 02:54:08
|
Revision: 4687 http://jython.svn.sourceforge.net/jython/?rev=4687&view=rev Author: nriley Date: 2008-06-19 19:54:06 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Don't install profile.properties for now; it breaks --profile. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-20 01:23:09 UTC (rev 4686) +++ trunk/jython/build.xml 2008-06-20 02:54:06 UTC (rev 4687) @@ -655,7 +655,9 @@ </chmod> <copy todir="${dist.dir}/javalib"> - <fileset dir="${jython.base.dir}/extlibs"/> + <fileset dir="${jython.base.dir}/extlibs"> + <exclude name="profile.properties"/> + </fileset> <fileset dir="${jython.base.dir}/build"> <include name="*.jar"/> <include name="*.properties"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nr...@us...> - 2008-06-20 02:56:19
|
Revision: 4688 http://jython.svn.sourceforge.net/jython/?rev=4688&view=rev Author: nriley Date: 2008-06-19 19:56:16 -0700 (Thu, 19 Jun 2008) Log Message: ----------- Run Jython launcher test from ant. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-06-20 02:54:06 UTC (rev 4687) +++ trunk/jython/build.xml 2008-06-20 02:56:16 UTC (rev 4688) @@ -140,6 +140,7 @@ <property name="source.dir" value="${jython.base.dir}/src" /> <property name="test.source.dir" value="${jython.base.dir}/tests/java" /> + <property name="test.shell.dir" value="${jython.base.dir}/tests/shell" /> <property name="templates.dir" value="${source.dir}/templates" /> <property name="python.lib" value="${jython.base.dir}/CPythonLib" /> <property name="bugtests.dir" value="${jython.base.dir}/bugtests" /> @@ -716,7 +717,7 @@ </jar> </target> - <target name="test" depends="javatest,regrtest"/> + <target name="test" depends="javatest,launchertest,regrtest"/> <target name="javatest" depends="compile,expose"> <junit fork="true" printsummary="true"> <classpath refid="test.classpath"/> @@ -728,6 +729,11 @@ </batchtest> </junit> </target> + <target name="launchertest" depends="developer-build"> + <exec executable="${test.shell.dir}/test-jython.sh"> + <arg value="${dist.dir}"/> + </exec> + </target> <target name="regrtest" depends="developer-build"> <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. |