From: <otm...@us...> - 2006-04-19 23:01:03
|
Revision: 2716 Author: otmarhumbel Date: 2006-04-19 16:00:55 -0700 (Wed, 19 Apr 2006) ViewCVS: http://svn.sourceforge.net/jython/?rev=2716&view=rev Log Message: ----------- partly enable full-build (checkout from SVN not yet implemented) Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-04-19 05:39:30 UTC (rev 2715) +++ trunk/jython/build.xml 2006-04-19 23:00:55 UTC (rev 2716) @@ -172,6 +172,7 @@ <!-- init properties for the developer build --> <target name="developer-init" depends="pre-init"> <property name="work.dir" value="${basedir}" /> + <property name="jython.base.dir" value="${basedir}" /> <property name="source.dir" value="${basedir}/src" /> <property name="python.lib" value="${python.home}/Lib" /> </target> @@ -188,7 +189,8 @@ <property name="work.dir" value="${basedir}/../full_build_${cvs.tag}" /> <property name="cvs.checkout.dir" value="${work.dir}/checkout" /> - <property name="source.dir" value="${cvs.checkout.dir}/jython/src" /> + <property name="jython.base.dir" value="${cvs.checkout.dir}/jython" /> + <property name="source.dir" value="${jython.base.dir}/src" /> <property name="has.cvs.connection" value="true" /> <property name="python.module" value="python/dist/src/Lib" /> <property name="python.lib" value="${cvs.checkout.dir}/${python.module}" /> @@ -221,6 +223,7 @@ <echo>jdbc3.0 = '${jdbc30.present}'</echo> <echo>--- properties ---</echo> <echo>work.dir = '${work.dir}'</echo> + <echo>jython.base.dir = '${jython.base.dir}'</echo> <echo>source.dir = '${source.dir}'</echo> <echo>parser.dir = '${parser.dir}'</echo> <echo>output.dir = '${output.dir}'</echo> @@ -253,7 +256,7 @@ unless="developer-build-called" description="clean up build working directories" > - <!-- do not hard delete ${work.dir}, since it could be basedir --> + <!-- do not hard delete ${work.dir}, since it could be ${basedir} --> <!-- deletes all files and subdirectories of ${output.dir}, without ${output.dir} itself. --> <delete includeemptydirs="true" failonerror="false"> <fileset dir="${output.dir}" includes="**/*" /> @@ -350,8 +353,6 @@ nowarn="${nowarn}" > <exclude name="org/python/parser/python.java" /> - <!-- end of java files to be removed from cvs --> - <exclude name="**/PyServlet.java" unless="servlet.present" /> <exclude name="**/ReadlineConsole.java" unless="readline.present" /> <exclude name="**/handler/InformixDataHandler.java" unless="informix.present" /> @@ -365,7 +366,7 @@ <classpath refid="main.classpath" /> </javac> - <javac srcdir="${basedir}/Lib" + <javac srcdir="${jython.base.dir}/Lib" includes="jxxload_help/**" destdir="${output.dir}/" target="${jdk.target.version}" @@ -377,7 +378,7 @@ /> <!-- java files used by tests --> - <javac srcdir="${basedir}/Lib/test/" + <javac srcdir="${jython.base.dir}/Lib/test/" includes="javatests/**" destdir="${output.dir}/" target="${jdk.target.version}" @@ -446,7 +447,7 @@ </copy> <!-- Create .html files in Doc --> <apply executable="${python.exe}" dir="Doc"> - <env key="PYTHONPATH" path="${basedir}/Misc/htgen" /> + <env key="PYTHONPATH" path="${jython.base.dir}/Misc/htgen" /> <arg line="${ht2html.dir}/ht2html.py" /> <arg line="-s JyLocalGenerator" /> <fileset dir="${dist.dir}/Doc"> @@ -478,9 +479,9 @@ <!-- copy for full distribution --> <target name="copy-full" if="full-build"> <!-- Misc files --> - <echo>copy misc files from ${basedir}</echo> + <echo>copy misc files from ${jython.base.dir}</echo> <copy todir="${dist.dir}" preservelastmodified="true"> - <fileset dir="${basedir}" + <fileset dir="${jython.base.dir}" includes="ACKNOWLEDGMENTS, build.xml, build.Lib.include.properties, NEWS, LICENSE.txt, README.txt, registry" /> </copy> @@ -491,9 +492,9 @@ <copy file="${python.home}/LICENSE.txt" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" /> <!-- sources: todir has to correspond with installer/**/JarInstaller.java --> - <echo>copy sources from ${basedir}</echo> + <echo>copy sources from ${jython.base.dir}</echo> <copy todir="${dist.dir}/src/java" preservelastmodified="true"> - <fileset dir="${basedir}"> + <fileset dir="${jython.base.dir}"> <include name="src/**/*.java" /> <include name="src/com/**/*.properties" /> <include name="Lib/jxxload_help/*.java" /> @@ -505,9 +506,9 @@ </copy> <!-- The demo files --> - <echo>copy the demo files from ${basedir}/Demo</echo> + <echo>copy the demo files from ${jython.base.dir}/Demo</echo> <copy todir="${dist.dir}/Demo" preservelastmodified="true"> - <fileset dir="${basedir}/Demo"> + <fileset dir="${jython.base.dir}/Demo"> <include name="**/*.java" /> <include name="**/*.html" /> <include name="**/*.py" /> @@ -524,9 +525,9 @@ <!-- copy for distribution --> <target name="copy-dist" depends="jar, doc, javadoc, copy-full"> <!-- Tools: jythonc and freeze --> - <echo>copy Tools from ${basedir}/Tools</echo> + <echo>copy Tools from ${jython.base.dir}/Tools</echo> <copy todir="${dist.dir}" preservelastmodified="true"> - <fileset dir="${basedir}" includes="Tools/**/*.py" /> + <fileset dir="${jython.base.dir}" includes="Tools/**/*.py" /> </copy> <!-- Copy the CPython standard library files --> @@ -534,15 +535,15 @@ <copy todir="${dist.dir}/Lib" preservelastmodified="true"> <fileset dir="${python.lib}" excludes="**/*.pyc, **/*.pyo"> <patternset> - <includesfile name="${basedir}/build.Lib.include.properties" /> + <includesfile name="${jython.base.dir}/build.Lib.include.properties" /> </patternset> </fileset> </copy> <!-- The jython .py modules: important to overwrite the above CPython .py files --> - <echo>copy the jython *.py modules from ${basedir}/Lib</echo> + <echo>copy the jython *.py modules from ${jython.base.dir}/Lib</echo> <copy todir="${dist.dir}/Lib" preservelastmodified="true" overwrite="true"> - <fileset dir="${basedir}/Lib" excludes="**/*.class"/> + <fileset dir="${jython.base.dir}/Lib" excludes="**/*.class"/> </copy> </target> @@ -550,7 +551,7 @@ <!-- wrap the build into the installer --> <target name="install" depends="copy-dist"> <fail unless="cvs.tag" message="no cvs.tag specified" /> - <property name="install.src.dir" value="${basedir}/../installer/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: <otm...@us...> - 2006-04-25 22:50:39
|
Revision: 2719 Author: otmarhumbel Date: 2006-04-25 15:50:31 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/jython/?rev=2719&view=rev Log Message: ----------- enable full build using svn checkout Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-04-25 02:14:19 UTC (rev 2718) +++ trunk/jython/build.xml 2006-04-25 22:50:31 UTC (rev 2719) @@ -13,16 +13,21 @@ This build will create directories /build and /dist below basedir. -Use case 2: full build for a release (using cvs checkout) +Use case 2: full build for a release (using svn checkout) --------------------------------------------------------- - - make sure you have access to anonymous cvs - - override cvs.tag in ant.properties (if necessary) + - make sure you have access to the jython subversion repository (https://svn.sourceforge.net/svnroot/jython) + - make sure you have access and to cpython anonymous cvs (pserver:ano...@cv...:/cvsroot/python) + - override svn.tag in ant.properties (if necessary) - call target 'full-build' -This build will create a working directory named full_build_${cvs.tag} at the same +This build will create a working directory named full_build_${svn.tag} at the same level as your local directories bugtests, jython, sandbox and installer. -It will contain a big jython_${cvs.tag}.jar file suitable for installation. +It will contain a big jython_${svn.tag}.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. + Use case 3: build only the parser (grammar) ------------------------------------------- - override javaccHome in ant.properties (if necessary) @@ -54,16 +59,16 @@ Actions for a release --------------------- - 1. determine the new cvs tag to be applied to jython + 1. determine the new svn tag to be applied to jython 2. determine the existing cvs tag of the CPython Lib files which should be included 3. change the following properties in this build.xml, if necessary: - - cvs.tag (target: full-init) + - svn.tag (target: full-init) - python.cvs.tag (target: full-init) - jdk.target.version (target: pre-init) 4. if new CPython .py files should be distributed, add them to build.Lib.include.properties 5. adjust the public static String version in PySystemState.java 6. check in all the changes - 7. apply the new tag to the jython cvs (all projects) + 7. apply the new tag to the jython svn (all projects) 8. call target 'full-build' @@ -101,10 +106,12 @@ #optimize=off #deprecation=off -# - the cvs tag to build from; only needed for full-build -#cvs.tag=Release_2_2alpha0 -#cvs.tag=HEAD -#cvs.tag=pep302 +# - the svn tag to build from; only needed for full-build +#svn.tag=Release_2_2alpha2 +svn.tag=HEAD + +# - the directory containing javahl .dll (on windows) and .jar; only needed for full-build +javahl.dir=C:/Programme/Subversion/javahl </echo> </target> @@ -117,7 +124,7 @@ <!-- full build --> - <target name="full-build" depends="full-init, post-init, install" description="a full build from cvs" /> + <target name="full-build" depends="full-init, post-init, install" description="a full build from svn" /> <!-- set a property to indicate that target 'developer-build' was really called --> @@ -183,20 +190,20 @@ <!-- use this property to distinguish a full-build from a developer-build --> <property name="full-build" value="true" /> - <!-- predefined cvs tags for jython and cpython --> - <property name="cvs.tag" value="HEAD" /> + <!-- predefined tags for jython and cpython --> + <property name="svn.tag" value="HEAD" /> <property name="python.cvs.tag" value="r223" /> - <property name="work.dir" value="${basedir}/../full_build_${cvs.tag}" /> - <property name="cvs.checkout.dir" value="${work.dir}/checkout" /> - <property name="jython.base.dir" value="${cvs.checkout.dir}/jython" /> + <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" /> + <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="has.cvs.connection" value="true" /> + <property name="has.repositories.connection" value="true" /> <property name="python.module" value="python/dist/src/Lib" /> - <property name="python.lib" value="${cvs.checkout.dir}/${python.module}" /> + <property name="python.lib" value="${svn.checkout.dir}/${python.module}" /> <property name="python.exe" value="${python.home}/python" /> <condition property="do.checkout" value="true"> - <istrue value="${has.cvs.connection}" /> + <istrue value="${has.repositories.connection}" /> </condition> </target> @@ -239,10 +246,10 @@ <echo>debug = '${debug}'</echo> <echo>optimize = '${optimize}'</echo> <echo>nowarn = '${nowarn}'</echo> - <echo>--- properties (used for full-build only )---</echo> - <echo>cvs.tag = '${cvs.tag}'</echo> + <echo>--- properties (used for full-build only ) ---</echo> + <echo>svn.tag = '${svn.tag}'</echo> <echo>python.cvs.tag = '${python.cvs.tag}'</echo> - <echo>cvs.checkout.dir = '${cvs.checkout.dir}'</echo> + <echo>svn.checkout.dir = '${svn.checkout.dir}'</echo> <echo>do.checkout = '${do.checkout}'</echo> <echo>python.exe = '${python.exe}'</echo> </target> @@ -272,10 +279,10 @@ </target> - <!-- clean cvs.checkout.dir if we really checkout --> + <!-- clean svn.checkout.dir if we really checkout --> <target name="clean-checkout-dir" if="do.checkout"> <delete includeemptydirs="true" failonerror="false"> - <fileset dir="${cvs.checkout.dir}" includes="**/*" defaultexcludes="no" /> + <fileset dir="${svn.checkout.dir}" includes="**/*" defaultexcludes="no" /> </delete> </target> @@ -297,39 +304,31 @@ <!-- create checkout directory if necessary --> <target name="prepare-checkout" if="do.checkout"> - <mkdir dir="${cvs.checkout.dir}" /> + <mkdir dir="${svn.checkout.dir}" /> </target> - <!-- checkout from cvs if so defined --> + <!-- checkout if so defined --> <target name="checkout" depends="prepare" if="do.checkout"> - <!-- common properties --> - <property name="sf.cvs.root" value=":pserver:ano...@cv...:/cvsroot" /> - - <!-- jython --> - <property name="jython.cvs.root" value="${sf.cvs.root}/jython" /> - <echo>setting jython password for anonymous</echo> - <cvspass cvsroot="${jython.cvs.root}" password="" /> - <!-- -r: use the cvs tag, -P: prune empty directories --> - <property name="jython.checkout.options" value="checkout -r ${cvs.tag} -P" /> - <property name="jython.checkout.command" value="-z3 -d${jython.cvs.root} ${jython.checkout.options}" /> - <echo>checking out jython with the following command: ${jython.checkout.command} jython</echo> - <cvs command="${jython.checkout.command} jython" dest="${cvs.checkout.dir}" /> - <!-- -f: use HEAD if tag not found, -r: use the cvs tag, -P: prune empty directories --> - <property name="installer.checkout.options" value="checkout -f -r ${cvs.tag} -P" /> - <property name="installer.checkout.command" value="-z3 -d${jython.cvs.root} ${installer.checkout.options}" /> - <echo>checking out installer with the following command: ${installer.checkout.command} installer</echo> - <cvs command="${installer.checkout.command} installer" dest="${cvs.checkout.dir}" /> - + <!-- jython and installer: determine if to checkout from /tags/${svn.tag} (any tag), or /trunk (HEAD) --> + <condition property="svn.main.dir" value="trunk"> + <equals arg1="${svn.tag}" arg2="HEAD" /> + </condition> + <property name="svn.main.dir" value="tags/${svn.tag}" /> + <svn javahl="${javahl.dir}" > + <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" destPath="${svn.checkout.dir}/jython" /> + <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" destPath="${svn.checkout.dir}/installer" /> + </svn> + <!-- cpython --> - <property name="python.cvs.root" value="${sf.cvs.root}/python" /> + <property name="python.cvs.root" value=":pserver:ano...@cv...:/cvsroot/python" /> <echo>setting python password for anonymous</echo> <cvspass cvsroot="${python.cvs.root}" password="" /> <!-- -r: use the cvs tag, -P: prune empty directories --> <property name="python.checkout.options" value="checkout -r ${python.cvs.tag} -P" /> <property name="python.checkout.command" value="-z3 -d${python.cvs.root} ${python.checkout.options}" /> <echo>checking out ${python.module} with the following command: ${python.checkout.command} ${python.module}</echo> - <cvs command="${python.checkout.command} ${python.module}" dest="${cvs.checkout.dir}" /> + <cvs command="${python.checkout.command} ${python.module}" dest="${svn.checkout.dir}" /> </target> @@ -416,8 +415,8 @@ <attribute name="Built-By" value="${user.name}" /> <!-- info section. ATTN: no blanks, no '.' in the names --> <section name="Build-Info"> - <attribute name="version" value="${cvs.tag}" /> - <attribute name="cvs-build" value="${do.checkout}" /> + <attribute name="version" value="${svn.tag}" /> + <attribute name="svn-build" value="${do.checkout}" /> <attribute name="threadlocal" value="${threadlocal.present}" /> <attribute name="secureclassloader" value="${secureclassloader.present}" /> <attribute name="servlet" value="${servlet.present}" /> @@ -550,7 +549,7 @@ <!-- wrap the build into the installer --> <target name="install" depends="copy-dist"> - <fail unless="cvs.tag" message="no cvs.tag specified" /> + <fail unless="svn.tag" message="no svn.tag specified" /> <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}" @@ -565,8 +564,10 @@ /> <echo>copy installer classes to ${dist.dir}</echo> <copy todir="${dist.dir}" preservelastmodified="true"> - <fileset dir="${output.dir}" includes="org/python/util/install/**/*.class" /> - <fileset dir="${output.dir}" includes="org/apache/commons/cli/*.class" /> + <fileset dir="${output.dir}"> + <include name="org/python/util/install/**/*.class" /> + <include name="org/apache/commons/cli/*.class" /> + </fileset> </copy> <echo>copy installer icon to ${dist.dir}</echo> <copy todir="${dist.dir}" preservelastmodified="true"> @@ -574,18 +575,18 @@ <fileset dir="${install.src.dir}" includes="**/*.png" excludes="bin/**" /> </copy> <echo>building installer .jar file</echo> - <jar destfile="${work.dir}/jython_${cvs.tag}.jar" basedir="${dist.dir}" update="true"> + <jar destfile="${work.dir}/jython_${svn.tag}.jar" basedir="${dist.dir}" update="true"> <manifest> <attribute name="Main-Class" value="org.python.util.install.Installation" /> <attribute name="Built-By" value="${user.name}" /> <!-- section for the install program --> <section name="Jython"> - <attribute name="version" value="${cvs.tag}" /> + <attribute name="version" value="${svn.tag}" /> <attribute name="exclude-dirs" value="org;META-INF" /> </section> <!-- info section. ATTN: no blanks, no '.' in the names --> <section name="Build-Info"> - <attribute name="cvs-build" value="${do.checkout}" /> + <attribute name="svn-build" value="${do.checkout}" /> <attribute name="cpython-version" value="${python.cvs.tag}" /> <attribute name="threadlocal" value="${threadlocal.present}" /> <attribute name="secureclassloader" value="${secureclassloader.present}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2006-05-28 21:22:57
|
Revision: 2775 Author: otmarhumbel Date: 2006-05-28 14:22:50 -0700 (Sun, 28 May 2006) ViewCVS: http://svn.sourceforge.net/jython/?rev=2775&view=rev Log Message: ----------- - using a taskdef for the svn task - better documentation of svn stuff - this no longer requires interfering with ant runtime classpath Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-05-28 18:24:00 UTC (rev 2774) +++ trunk/jython/build.xml 2006-05-28 21:22:50 UTC (rev 2775) @@ -110,8 +110,23 @@ #svn.tag=Release_2_2alpha2 svn.tag=HEAD -# - the directory containing javahl .dll (on windows) and .jar; only needed for full-build +# - 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) +# - unzip the .dll and .jar into javahl.dir javahl.dir=C:/Programme/Subversion/javahl + +# - the directory containing the svnant related .jar files; only needed for full-build +# the following .jar files (probably) are needed: +# - commons-lang-2.0.jar +# - jakarta-regexp-1.3.jar +# - svnant.jar +# - 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 +svnant.jar.dir=${basedir}/../externals/svnant-jars </echo> </target> @@ -205,6 +220,17 @@ <condition property="do.checkout" value="true"> <istrue value="${has.repositories.connection}" /> </condition> + + <!-- classpath for svn ant task --> + <path id="svn.classpath"> + <pathelement path="${java.class.path}" /> + <fileset dir="${svnant.jar.dir}"> + <include name="*.jar"/> + </fileset> + </path> + <!-- taskdef for svn ant task --> + <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> + </target> @@ -247,11 +273,13 @@ <echo>optimize = '${optimize}'</echo> <echo>nowarn = '${nowarn}'</echo> <echo>--- properties (used for full-build only ) ---</echo> + <echo>python.exe = '${python.exe}'</echo> <echo>svn.tag = '${svn.tag}'</echo> <echo>python.cvs.tag = '${python.cvs.tag}'</echo> <echo>svn.checkout.dir = '${svn.checkout.dir}'</echo> + <echo>javahl.dir = '${javahl.dir}'</echo> + <echo>svnant.jar.dir = '${svnant.jar.dir}'</echo> <echo>do.checkout = '${do.checkout}'</echo> - <echo>python.exe = '${python.exe}'</echo> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2006-10-13 22:23:14
|
Revision: 2951 http://svn.sourceforge.net/jython/?rev=2951&view=rev Author: otmarhumbel Date: 2006-10-13 15:23:06 -0700 (Fri, 13 Oct 2006) Log Message: ----------- bugfix 1565644: corrected typo Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-10-13 21:58:52 UTC (rev 2950) +++ trunk/jython/build.xml 2006-10-13 22:23:06 UTC (rev 2951) @@ -215,7 +215,7 @@ <property name="python.cvs.tag" value="r223" /> <!-- revision handling --> - <property name="svn.revison" value="${svn.tag}" /> + <property name="svn.revision" value="${svn.tag}" /> <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" /> <property name="svn.checkout.dir" value="${work.dir}/checkout" /> @@ -230,7 +230,7 @@ </condition> <condition property="do.snapshot.build" value="true"> <not> - <equals arg1="${svn.revison}" arg2="${svn.tag}" /> + <equals arg1="${svn.revision}" arg2="${svn.tag}" /> </not> </condition> @@ -291,7 +291,7 @@ <echo>svn.checkout.dir = '${svn.checkout.dir}'</echo> <echo>javahl.dir = '${javahl.dir}'</echo> <echo>svnant.jar.dir = '${svnant.jar.dir}'</echo> - <echo>svn.revison = '${svn.revison}'</echo> + <echo>svn.revision = '${svn.revision}'</echo> <echo>do.snapshot.build = '${do.snapshot.build}'</echo> <echo>do.checkout = '${do.checkout}'</echo> </target> @@ -358,8 +358,8 @@ </condition> <property name="svn.main.dir" value="tags/${svn.tag}" /> <svn javahl="${javahl.dir}" > - <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revison}" destPath="${svn.checkout.dir}/jython" /> - <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revison}" destPath="${svn.checkout.dir}/installer" /> + <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" /> + <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> </svn> <!-- cpython --> @@ -376,10 +376,10 @@ <!-- change the version string, if so defined: used for snapshot builds --> <!-- the following replacements have to be updated if the version strings in PySystemState.java change --> <target name="version" depends="checkout" if="do.snapshot.build" > - <property name="replace.value.version" value='version = "2.2a${svn.revison}"' /> + <property name="replace.value.version" value='version = "2.2a${svn.revision}"' /> <replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2a1"' value="${replace.value.version}" /> <replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0A" value="PY_RELEASE_LEVEL = 0xAA" /> - <property name="replace.value.serial" value="PY_RELEASE_SERIAL = ${svn.revison}" /> + <property name="replace.value.serial" value="PY_RELEASE_SERIAL = ${svn.revision}" /> <replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_SERIAL = 1" value="${replace.value.serial}" /> </target> @@ -466,7 +466,7 @@ <attribute name="Built-By" value="${user.name}" /> <!-- info section. ATTN: no blanks, no '.' in the names --> <section name="Build-Info"> - <attribute name="version" value="${svn.revison}" /> + <attribute name="version" value="${svn.revision}" /> <attribute name="svn-build" value="${do.checkout}" /> <attribute name="threadlocal" value="${threadlocal.present}" /> <attribute name="secureclassloader" value="${secureclassloader.present}" /> @@ -626,13 +626,13 @@ <fileset dir="${install.src.dir}" includes="**/*.png" excludes="bin/**" /> </copy> <echo>building installer .jar file</echo> - <jar destfile="${work.dir}/jython_${svn.revison}.jar" basedir="${dist.dir}" update="true"> + <jar destfile="${work.dir}/jython_${svn.revision}.jar" basedir="${dist.dir}" update="true"> <manifest> <attribute name="Main-Class" value="org.python.util.install.Installation" /> <attribute name="Built-By" value="${user.name}" /> <!-- section for the install program --> <section name="Jython"> - <attribute name="version" value="${svn.revison}" /> + <attribute name="version" value="${svn.revision}" /> <attribute name="exclude-dirs" value="org;META-INF" /> </section> <!-- info section. ATTN: no blanks, no '.' in the names --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2006-10-14 20:00:09
|
Revision: 2953 http://svn.sourceforge.net/jython/?rev=2953&view=rev Author: otmarhumbel Date: 2006-10-14 12:59:57 -0700 (Sat, 14 Oct 2006) Log Message: ----------- checkout bugtests, too (to enable integrated tests after a full-build) Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-10-14 03:16:54 UTC (rev 2952) +++ trunk/jython/build.xml 2006-10-14 19:59:57 UTC (rev 2953) @@ -360,6 +360,7 @@ <svn javahl="${javahl.dir}" > <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" /> <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> + <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/bugtests" revision="${svn.revision}" destPath="${svn.checkout.dir}/bugtests" /> </svn> <!-- cpython --> @@ -373,6 +374,7 @@ <cvs command="${python.checkout.command} ${python.module}" dest="${svn.checkout.dir}" /> </target> + <!-- change the version string, if so defined: used for snapshot builds --> <!-- the following replacements have to be updated if the version strings in PySystemState.java change --> <target name="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: <cg...@us...> - 2006-10-17 02:43:50
|
Revision: 2964 http://svn.sourceforge.net/jython/?rev=2964&view=rev Author: cgroves Date: 2006-10-16 19:43:45 -0700 (Mon, 16 Oct 2006) Log Message: ----------- exclude test/output/test_sax from python.lib since the test_sax.py we're using is from pyxml and uses the regular test support mechanisms to note failure Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-10-17 02:42:13 UTC (rev 2963) +++ trunk/jython/build.xml 2006-10-17 02:43:45 UTC (rev 2964) @@ -84,7 +84,7 @@ ht2html.dir=${basedir}/../externals/ht2html-2.0 # - define the home of the corresponding CPython version -python.home=c:/Programme/Python/Python22 +python.home=/Users/groves/dev/src/Python-2.2.3 # - javax.servlet servlet.jar=c:/workspace/HEAD/CH.obj.commons.core/make_lib/j2ee.jar @@ -588,6 +588,7 @@ <fileset dir="${python.lib}" excludes="**/*.pyc, **/*.pyo"> <patternset> <includesfile name="${jython.base.dir}/build.Lib.include.properties" /> + <exclude name="test/output/test_sax"/> </patternset> </fileset> </copy> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2006-11-21 10:37:16
|
Revision: 2984 http://svn.sourceforge.net/jython/?rev=2984&view=rev Author: otmarhumbel Date: 2006-11-21 02:37:15 -0800 (Tue, 21 Nov 2006) Log Message: ----------- full-build now also takes advantage of the new CPythonLib directory defined in svn:externals Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-11-21 09:51:05 UTC (rev 2983) +++ trunk/jython/build.xml 2006-11-21 10:37:15 UTC (rev 2984) @@ -16,7 +16,6 @@ Use case 2: full build for a release (using svn checkout) --------------------------------------------------------- - make sure you have access to the jython subversion repository (https://svn.sourceforge.net/svnroot/jython) - - make sure you have access and to cpython anonymous cvs (pserver:ano...@cv...:/cvsroot/python) - override svn.tag in ant.properties (if necessary) - call target 'full-build' This build will create a working directory named full_build_${svn.tag} at the same @@ -60,14 +59,14 @@ Actions for a release --------------------- 1. determine the new svn tag to be applied to jython - 2. determine the existing cvs tag of the CPython Lib files which should be included + 2. check the svn:externals property of project jython for an appropriate cpython maintenance branch 3. change the following properties in this build.xml, if necessary: - svn.tag (target: full-init) - - python.cvs.tag (target: full-init) - jdk.target.version (target: pre-init) 4. if new CPython .py files should be distributed, add them to build.Lib.include.properties 5. adjust the public static String version in PySystemState.java 6. adjust the version strings in target 'version' of this build.xml + (this is for upcoming snapshot builds only) 7. check in all the changes 8. apply the new tag to the jython svn (all projects) 9. call target 'full-build' @@ -213,7 +212,6 @@ <!-- predefined tags for jython and cpython --> <property name="svn.tag" value="HEAD" /> - <property name="python.cvs.tag" value="r223" /> <!-- revision handling --> <property name="svn.revision" value="${svn.tag}" /> @@ -223,8 +221,7 @@ <property name="jython.base.dir" value="${svn.checkout.dir}/jython" /> <property name="source.dir" value="${jython.base.dir}/src" /> <property name="has.repositories.connection" value="true" /> - <property name="python.module" value="python/dist/src/Lib" /> - <property name="python.lib" value="${svn.checkout.dir}/${python.module}" /> + <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}" /> @@ -288,7 +285,6 @@ <echo>--- properties (used for full-build only ) ---</echo> <echo>python.exe = '${python.exe}'</echo> <echo>svn.tag = '${svn.tag}'</echo> - <echo>python.cvs.tag = '${python.cvs.tag}'</echo> <echo>svn.checkout.dir = '${svn.checkout.dir}'</echo> <echo>javahl.dir = '${javahl.dir}'</echo> <echo>svnant.jar.dir = '${svnant.jar.dir}'</echo> @@ -353,7 +349,7 @@ <!-- checkout if so defined --> <target name="checkout" depends="prepare" if="do.checkout"> - <!-- jython and installer: determine if to checkout from /tags/${svn.tag} (any tag), or /trunk (HEAD) --> + <!-- determine if to checkout from /tags/${svn.tag} (any tag), or /trunk (HEAD) --> <condition property="svn.main.dir" value="trunk"> <equals arg1="${svn.tag}" arg2="HEAD" /> </condition> @@ -363,16 +359,6 @@ <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/bugtests" revision="${svn.revision}" destPath="${svn.checkout.dir}/bugtests" /> </svn> - - <!-- cpython --> - <property name="python.cvs.root" value=":pserver:ano...@cv...:/cvsroot/python" /> - <echo>setting python password for anonymous</echo> - <cvspass cvsroot="${python.cvs.root}" password="" /> - <!-- -r: use the cvs tag, -P: prune empty directories --> - <property name="python.checkout.options" value="checkout -r ${python.cvs.tag} -P" /> - <property name="python.checkout.command" value="-z3 -d${python.cvs.root} ${python.checkout.options}" /> - <echo>checking out ${python.module} with the following command: ${python.checkout.command} ${python.module}</echo> - <cvs command="${python.checkout.command} ${python.module}" dest="${svn.checkout.dir}" /> </target> @@ -633,7 +619,7 @@ <fileset dir="${python.lib}" excludes="**/*.pyc, **/*.pyo"> <patternset> <includesfile name="${jython.base.dir}/build.Lib.include.properties" /> - <exclude name="test/output/test_sax"/> + <exclude name="test/output/test_sax"/> </patternset> </fileset> </copy> @@ -686,7 +672,6 @@ <!-- info section. ATTN: no blanks, no '.' in the names --> <section name="Build-Info"> <attribute name="svn-build" value="${do.checkout}" /> - <attribute name="cpython-version" value="${python.cvs.tag}" /> <attribute name="threadlocal" value="${threadlocal.present}" /> <attribute name="secureclassloader" value="${secureclassloader.present}" /> <attribute name="servlet" value="${servlet.present}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2006-11-29 04:14:17
|
Revision: 3001 http://svn.sourceforge.net/jython/?rev=3001&view=rev Author: cgroves Date: 2006-11-28 20:14:16 -0800 (Tue, 28 Nov 2006) Log Message: ----------- move templates in here too Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-11-29 03:46:26 UTC (rev 3000) +++ trunk/jython/build.xml 2006-11-29 04:14:16 UTC (rev 3001) @@ -200,7 +200,7 @@ <property name="work.dir" value="${basedir}" /> <property name="jython.base.dir" value="${basedir}" /> <property name="source.dir" value="${basedir}/src" /> - <property name="templates.dir" value="${basedir}/../sandbox/jt" /> + <property name="templates.dir" value="${basedir}/src/templates" /> <property name="python.lib" value="${basedir}/CPythonLib" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2006-12-19 22:32:27
|
Revision: 3024 http://svn.sourceforge.net/jython/?rev=3024&view=rev Author: otmarhumbel Date: 2006-12-19 14:32:22 -0800 (Tue, 19 Dec 2006) Log Message: ----------- the resulting .jar for the installation is now named jython_installer_<version>.jar Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2006-12-19 21:35:09 UTC (rev 3023) +++ trunk/jython/build.xml 2006-12-19 22:32:22 UTC (rev 3024) @@ -20,7 +20,7 @@ - call target 'full-build' This build will create a working directory named full_build_${svn.tag} at the same level as your local directories bugtests, jython, sandbox and installer. -It will contain a big jython_${svn.tag}.jar file suitable for installation. +It will contain a big jython_installer_${svn.tag}.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). @@ -654,7 +654,7 @@ <fileset dir="${install.src.dir}" includes="**/*.png" excludes="bin/**" /> </copy> <echo>building installer .jar file</echo> - <jar destfile="${work.dir}/jython_${svn.revision}.jar" basedir="${dist.dir}" update="true"> + <jar destfile="${work.dir}/jython_installer_${svn.revision}.jar" basedir="${dist.dir}" update="true"> <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: <kz...@us...> - 2007-01-05 02:56:58
|
Revision: 3044 http://svn.sourceforge.net/jython/?rev=3044&view=rev Author: kzuberi Date: 2007-01-04 18:56:56 -0800 (Thu, 04 Jan 2007) Log Message: ----------- attempt a magic auto-configurator for bugtests, and add convenience targets for running the test suites (admittedly of marginal utility) Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-01-05 01:27:11 UTC (rev 3043) +++ trunk/jython/build.xml 2007-01-05 02:56:56 UTC (rev 3044) @@ -202,6 +202,7 @@ <property name="source.dir" value="${basedir}/src" /> <property name="templates.dir" value="${basedir}/src/templates" /> <property name="python.lib" value="${basedir}/CPythonLib" /> + <property name="bugtests.dir" value="${basedir}/bugtests" /> </target> @@ -686,5 +687,53 @@ </jar> </target> + <!-- run regression test suite --> + <target name="regrtest" depends="developer-init, post-init"> + <java classname="org.python.util.jython" fork="true"> + <jvmarg value="-Dpython.home=${dist.dir}"/> + <arg value="${dist.dir}/Lib/test/regrtest.py"/> + <classpath> + <pathelement location="${dist.dir}/jython.jar"/> + </classpath> + </java> + </target> + <!-- run bugtests, create a config if necessary --> + <target name="bugtest" depends="developer-init, post-init, create-bugtest-config"> + <java classname="org.python.util.jython" fork="true" dir="${bugtests.dir}"> + <classpath> + <pathelement location="${dist.dir}/jython.jar"/> + </classpath> + <jvmarg value="-Dpython.home=${dist.dir}"/> + <arg value="driver.py"/> + </java> + </target> + + <!-- create support_config.py in the bugtset directory only if it doesn't already exist --> + <target name="create-bugtest-config" depends="developer-init, post-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: + + <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}/.." /> + <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) +java_home="${jdk.home}" +jython_home="${dist.dir}" +classpath="${dist.dir}/jython.jar${path.separator}classes" + </echo> + </target> + + <!-- set property have_bugtest_config if support_config.py already exists in the bugtest directory --> + <target name="check-bugtest-config"> + <available property="have_bugtest_config" file="${bugtests.dir}/support_config.py"/> + </target> + </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2007-01-10 21:55:33
|
Revision: 3048 http://svn.sourceforge.net/jython/?rev=3048&view=rev Author: otmarhumbel Date: 2007-01-10 13:55:29 -0800 (Wed, 10 Jan 2007) Log Message: ----------- checkout during full-build now reflects the fact that bugtests are a subdirectory of jython Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-01-09 22:25:19 UTC (rev 3047) +++ trunk/jython/build.xml 2007-01-10 21:55:29 UTC (rev 3048) @@ -19,7 +19,7 @@ - override svn.tag in ant.properties (if necessary) - call target 'full-build' This build will create a working directory named full_build_${svn.tag} at the same -level as your local directories bugtests, jython, sandbox and installer. +level as your local directories jython, sandbox and installer. It will contain a big jython_installer_${svn.tag}.jar file suitable for installation. Please be aware: @@ -358,7 +358,6 @@ <svn javahl="${javahl.dir}" > <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" /> <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> - <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/bugtests" revision="${svn.revision}" destPath="${svn.checkout.dir}/bugtests" /> </svn> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2007-01-10 21:59:54
|
Revision: 3049 http://svn.sourceforge.net/jython/?rev=3049&view=rev Author: otmarhumbel Date: 2007-01-10 13:59:52 -0800 (Wed, 10 Jan 2007) Log Message: ----------- get the correct cpython license file during full-build Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-01-10 21:55:29 UTC (rev 3048) +++ trunk/jython/build.xml 2007-01-10 21:59:52 UTC (rev 3049) @@ -67,9 +67,10 @@ 5. adjust the public static String version in PySystemState.java 6. adjust the version strings in target 'version' of this build.xml (this is for upcoming snapshot builds only) - 7. check in all the changes - 8. apply the new tag to the jython svn (all projects) - 9. call target 'full-build' + 7, adjust the url for the cpython maintenance branch in target 'checkout' of this build.xml + 8. check in all the changes + 9. apply the new tag to the jython svn (all projects) + 10. call target 'full-build' @@ -359,6 +360,11 @@ <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" /> <checkout url="https://svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> </svn> + + <!-- 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" /> + </svn> </target> @@ -564,9 +570,8 @@ </copy> <!-- copy the CPython license --> - <echo>copy CPython LICENSE from ${python.home} to ${dist.dir}/LICENSE_CPython.txt</echo> - <!-- +++ TODO: checkout the CPython LICENSE (not: .txt) and copy from there --> - <copy file="${python.home}/LICENSE.txt" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" /> + <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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-02-06 06:27:50
|
Revision: 3088 http://svn.sourceforge.net/jython/?rev=3088&view=rev Author: cgroves Date: 2007-02-05 22:27:49 -0800 (Mon, 05 Feb 2007) Log Message: ----------- require all optional jars for full-build Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-02-06 04:29:50 UTC (rev 3087) +++ trunk/jython/build.xml 2007-02-06 06:27:49 UTC (rev 3088) @@ -243,6 +243,13 @@ </path> <!-- taskdef for svn ant task --> <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> + <!-- Require all of the optional jars for a full build --> + <fail unless="readline.present" message="readline jar not present" /> + <fail unless="servlet.present" message="servlet jar not present" /> + <fail unless="informix.present" message="informix jar not present" /> + <fail unless="mysql.present" message="mysql jar not present" /> + <fail unless="postgresql.present" message="postgres jar not present" /> + <fail unless="oracle.present" message="oracle jar not present" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-02-08 23:12:54
|
Revision: 3097 http://svn.sourceforge.net/jython/?rev=3097&view=rev Author: cgroves Date: 2007-02-08 15:12:49 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Don't use the tag name as a revision number to svn commands Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-02-08 04:17:11 UTC (rev 3096) +++ trunk/jython/build.xml 2007-02-08 23:12:49 UTC (rev 3097) @@ -20,7 +20,7 @@ - call target 'full-build' This build will create a working directory named full_build_${svn.tag} at the same level as your local directories jython, sandbox and installer. -It will contain a big jython_installer_${svn.tag}.jar file suitable for installation. +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). @@ -215,9 +215,6 @@ <!-- predefined tags for jython and cpython --> <property name="svn.tag" value="Release_2_2beta1" /> - <!-- revision handling --> - <property name="svn.revision" value="${svn.tag}" /> - <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" /> <property name="svn.checkout.dir" value="${work.dir}/checkout" /> <property name="jython.base.dir" value="${svn.checkout.dir}/jython" /> @@ -228,11 +225,14 @@ <condition property="do.checkout" value="true"> <istrue value="${has.repositories.connection}" /> </condition> - <condition property="do.snapshot.build" value="true"> - <not> - <equals arg1="${svn.revision}" arg2="${svn.tag}" /> - </not> + <condition property="do.snapshot.build"> + <isset property="svn.revision" /> </condition> + <condition property="jython.version" value="${svn.revision}"> + <isset property="svn.revision" /> + </condition> + <property name="jython.version" value="2.2b1" /> + <property name="svn.revision" value="HEAD"/> <!-- classpath for svn ant task --> <path id="svn.classpath"> @@ -368,9 +368,9 @@ <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> </svn> - <!-- checkout cpython license from the correct python maintenance branch --> + <!-- 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/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" /> </svn> </target> @@ -506,7 +506,7 @@ <attribute name="Built-By" value="${user.name}" /> <!-- info section. ATTN: no blanks, no '.' in the names --> <section name="Build-Info"> - <attribute name="version" value="${svn.revision}" /> + <attribute name="version" value="${jython.version}" /> <attribute name="svn-build" value="${do.checkout}" /> <attribute name="threadlocal" value="${threadlocal.present}" /> <attribute name="secureclassloader" value="${secureclassloader.present}" /> @@ -667,13 +667,13 @@ <fileset dir="${install.src.dir}" includes="**/*.png" excludes="bin/**" /> </copy> <echo>building installer .jar file</echo> - <jar destfile="${work.dir}/jython_installer_${svn.revision}.jar" basedir="${dist.dir}" update="true"> + <jar destfile="${work.dir}/jython_installer-${jython.version}.jar" basedir="${dist.dir}" update="true"> <manifest> <attribute name="Main-Class" value="org.python.util.install.Installation" /> <attribute name="Built-By" value="${user.name}" /> <!-- section for the install program --> <section name="Jython"> - <attribute name="version" value="${svn.revision}" /> + <attribute name="version" value="${jython.version}" /> <attribute name="exclude-dirs" value="org;META-INF" /> </section> <!-- info section. ATTN: no blanks, no '.' in the names --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-02-26 17:58:02
|
Revision: 3123 http://svn.sourceforge.net/jython/?rev=3123&view=rev Author: cgroves Date: 2007-02-26 09:57:58 -0800 (Mon, 26 Feb 2007) Log Message: ----------- only run templates if do.templates is specified. off in developer-build, on for full-build Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-02-25 22:56:03 UTC (rev 3122) +++ trunk/jython/build.xml 2007-02-26 17:57:58 UTC (rev 3123) @@ -212,6 +212,7 @@ <target name="full-init" depends="pre-init"> <!-- use this property to distinguish a full-build from a developer-build --> <property name="full-build" value="true" /> + <property name="do.templates" value="true" /> <!-- predefined tags for jython and cpython --> <property name="svn.tag" value="Release_2_2beta1" /> @@ -301,6 +302,7 @@ <echo>svn.revision = '${svn.revision}'</echo> <echo>do.snapshot.build = '${do.snapshot.build}'</echo> <echo>do.checkout = '${do.checkout}'</echo> + <echo>do.templates = '${do.templates}'</echo> </target> @@ -395,7 +397,7 @@ <!-- prepare template ant task --> - <target name="template-init" depends="prepare"> + <target name="template-init" depends="prepare" if="do.templates"> <javac srcdir="${source.dir}/" destdir="${output.dir}/" @@ -412,7 +414,7 @@ <!-- run templates --> - <target name="template" depends="checkout, template-init"> + <target name="template" depends="checkout, template-init" if="do.templates"> <taskdef name="gentempl" classname="org.python.util.TemplateAntTask" classpath="${output.dir}" /> <gentempl srcdir="${templates.dir}" verbose="true" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2007-05-28 11:57:49
|
Revision: 3245 http://svn.sourceforge.net/jython/?rev=3245&view=rev Author: otmarhumbel Date: 2007-05-28 04:57:41 -0700 (Mon, 28 May 2007) Log Message: ----------- in case of a snapshot build: modify README.txt to clearly indicate that it is a snapshot build Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-05-28 11:33:44 UTC (rev 3244) +++ trunk/jython/build.xml 2007-05-28 11:57:41 UTC (rev 3245) @@ -116,7 +116,7 @@ # - the revision; defaults to svn.tag; only needed for full-build # (uncomment and indicate the correct revision to do a snapshot build) -#svn.revision=2948 +#svn.revision=3245 # - the directory containing libsvnjavahl-1.dll (on windows) and svnjavahl.jar; only needed for full-build # how to get these: @@ -386,13 +386,28 @@ <!-- change the version string, if so defined: used for snapshot builds --> - <!-- the following replacements have to be updated if the version strings in PySystemState.java change --> + <!-- the following replacements have to be updated if the version strings + in PySystemState.java and README.txt change --> <target name="version" depends="checkout" if="do.snapshot.build" > <property name="replace.value.version" value='version = "2.2b${svn.revision}"' /> <replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2b2"' value="${replace.value.version}" /> <replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0B" value="PY_RELEASE_LEVEL = 0xAA" /> <property name="replace.value.serial" value="PY_RELEASE_SERIAL = ${svn.revision}" /> <replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_SERIAL = 2" value="${replace.value.serial}" /> + + <!-- change README.txt --> + <replace file="${jython.base.dir}/README.txt" token='2.2b2' value='2.2b${svn.revision}' /> + <replace file="${jython.base.dir}/README.txt"> + <replacetoken>=======================</replacetoken> + <replacevalue>-------------------------- + +This is a snapshot build. +It reflects the current development status. + +The readme text for the next release will be like: + + </replacevalue> + </replace> </target> <!-- separate build.xml for parser grammar --> @@ -720,6 +735,10 @@ </classpath> <jvmarg value="-Dpython.home=${dist.dir}"/> <arg value="driver.py"/> + <!-- uncomment if you want to run only one test: --> + <!-- + <arg value="386"/> + --> </java> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-06-23 22:08:33
|
Revision: 3265 http://svn.sourceforge.net/jython/?rev=3265&view=rev Author: cgroves Date: 2007-06-23 15:08:29 -0700 (Sat, 23 Jun 2007) Log Message: ----------- more 2.2rc1 version bumps Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-06-22 08:50:35 UTC (rev 3264) +++ trunk/jython/build.xml 2007-06-23 22:08:29 UTC (rev 3265) @@ -220,7 +220,7 @@ <property name="do.templates" value="true" /> <!-- predefined tags for jython and cpython --> - <property name="svn.tag" value="Release_2_2beta2" /> + <property name="svn.tag" value="Release_2_2rc1" /> <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" /> <property name="svn.checkout.dir" value="${work.dir}/checkout" /> @@ -238,7 +238,7 @@ <condition property="jython.version" value="${svn.revision}"> <isset property="svn.revision" /> </condition> - <property name="jython.version" value="2.2b2" /> + <property name="jython.version" value="2.2rc1" /> <property name="svn.revision" value="HEAD"/> <!-- classpath for svn ant task --> @@ -389,14 +389,14 @@ <!-- the following replacements have to be updated if the version strings in PySystemState.java and README.txt change --> <target name="version" depends="checkout" if="do.snapshot.build" > - <property name="replace.value.version" value='version = "2.2b${svn.revision}"' /> - <replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2b2"' value="${replace.value.version}" /> + <property name="replace.value.version" value='version = "2.2rc${svn.revision}"' /> + <replace file="${source.dir}/org/python/core/PySystemState.java" token='version = "2.2rc1"' value="${replace.value.version}" /> <replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_LEVEL = 0x0B" value="PY_RELEASE_LEVEL = 0xAA" /> <property name="replace.value.serial" value="PY_RELEASE_SERIAL = ${svn.revision}" /> <replace file="${source.dir}/org/python/core/PySystemState.java" token="PY_RELEASE_SERIAL = 2" value="${replace.value.serial}" /> <!-- change README.txt --> - <replace file="${jython.base.dir}/README.txt" token='2.2b2' value='2.2b${svn.revision}' /> + <replace file="${jython.base.dir}/README.txt" token='2.2rc1' value='2.2rc${svn.revision}' /> <replace file="${jython.base.dir}/README.txt"> <replacetoken>=======================</replacetoken> <replacevalue>-------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-09-15 23:42:34
|
Revision: 3478 http://jython.svn.sourceforge.net/jython/?rev=3478&view=rev Author: cgroves Date: 2007-09-15 16:42:24 -0700 (Sat, 15 Sep 2007) Log Message: ----------- Update the usage target for the new structure Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-09-15 23:31:12 UTC (rev 3477) +++ trunk/jython/build.xml 2007-09-15 23:42:24 UTC (rev 3478) @@ -1,11 +1,6 @@ <!-- Copyright 2000 Dj Walker-Morgan --> - - <project name="jython" default="developer-build" basedir="."> - - - <!-- print out some usage hints --> - <target name="usage" description="prints a short usage"> + <target name="usage" description="prints usage hints"> <echo> Use case 1: developer build (in your local jython copy) ------------------------------------------------------- @@ -45,6 +40,7 @@ - full-build - clean (uses developer-build settings if called directly) - parser (uses developer-build settings if called directly) + - copy-lib Following an ant convention, the callable targets have a description attribute. All other targets may give unpredicted results if called directly. @@ -58,22 +54,9 @@ Actions for a release --------------------- - 1. determine the new svn tag to be applied to jython - 2. check the svn:externals property of project jython for an appropriate cpython maintenance branch - 3. change the following properties in this build.xml, if necessary: - - svn.tag (target: full-init) - - jdk.target.version (target: pre-init) - 4. if new CPython .py files should be distributed, add them to build.Lib.include.properties - 5. adjust the public static String version in PySystemState.java - 6. adjust the version strings in target 'version' of this build.xml - (this is for upcoming snapshot builds only) - 7. adjust the url for the cpython maintenance branch in target 'checkout' of this build.xml - 8. check in all the changes - 9. apply the new tag to the jython svn (all projects) - 10. call target 'full-build' + http://wiki.python.org/jython/JythonDeveloperGuide/HowToReleaseJython - An example ant.properties file: ------------------------------- @@ -140,7 +123,7 @@ <target name="developer-build" depends="jar, copy-lib" description="a local build for developers" /> - <target name="full-build" depends="full-init, dump-env, install" description="a full build from svn" /> + <target name="full-build" depends="full-init, dump-env, install" description="a full build with svn checkout" /> <target name="common-init"> <property file="${user.home}/ant.properties" /> @@ -568,7 +551,7 @@ </copy> </target> - <target name="copy-lib" depends="init"> + <target name="copy-lib" depends="init" description="Copies the files from CPythonLib and Lib to dist"> <copy todir="${dist.dir}" preservelastmodified="true"> <fileset dir="${jython.base.dir}" includes="Tools/**/*.py" /> </copy> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-10-06 05:26:56
|
Revision: 3571 http://jython.svn.sourceforge.net/jython/?rev=3571&view=rev Author: cgroves Date: 2007-10-05 22:26:54 -0700 (Fri, 05 Oct 2007) Log Message: ----------- Add a target 'jarless' that's just developer-build without the jarring to shave a precious 2 seconds off my build Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-10-05 19:37:42 UTC (rev 3570) +++ trunk/jython/build.xml 2007-10-06 05:26:54 UTC (rev 3571) @@ -40,7 +40,6 @@ - full-build - clean (uses developer-build settings if called directly) - parser (uses developer-build settings if called directly) - - copy-lib Following an ant convention, the callable targets have a description attribute. All other targets may give unpredicted results if called directly. @@ -121,6 +120,8 @@ </echo> </target> + <target name="jarless" depends="compile, copy-lib"/> + <target name="developer-build" depends="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" /> @@ -551,7 +552,7 @@ </copy> </target> - <target name="copy-lib" depends="init" description="Copies the files from CPythonLib and Lib to dist"> + <target name="copy-lib" depends="init"> <copy todir="${dist.dir}" preservelastmodified="true"> <fileset dir="${jython.base.dir}" includes="Tools/**/*.py" /> </copy> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2007-11-18 02:33:20
|
Revision: 3697 http://jython.svn.sourceforge.net/jython/?rev=3697&view=rev Author: fwierzbicki Date: 2007-11-17 18:33:19 -0800 (Sat, 17 Nov 2007) Log Message: ----------- Make sure calling ant without arguments creates the necessary directories. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-11-18 02:16:20 UTC (rev 3696) +++ trunk/jython/build.xml 2007-11-18 02:33:19 UTC (rev 3697) @@ -122,7 +122,7 @@ <target name="jarless" depends="compile, copy-lib"/> - <target name="developer-build" depends="jar, copy-lib" description="a local build for developers" /> + <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" /> @@ -295,12 +295,15 @@ </delete> </target> - <!-- create necessary directories --> - <target name="prepare" depends="prepare-full, prepare-checkout"> + <!-- create output directories --> + <target name ="prepare-output" depends="init"> <mkdir dir="${output.dir}" /> <mkdir dir="${dist.dir}" /> </target> + <!-- create necessary directories --> + <target name="prepare" depends="prepare-full, prepare-checkout, prepare-output"/> + <!-- create directories needed only in full-build --> <target name="prepare-full" depends="clean" if="full-build"> <mkdir dir="${work.dir}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2007-11-27 22:33:17
|
Revision: 3737 http://jython.svn.sourceforge.net/jython/?rev=3737&view=rev Author: otmarhumbel Date: 2007-11-27 14:33:15 -0800 (Tue, 27 Nov 2007) Log Message: ----------- enabled full-build again Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-11-27 19:51:28 UTC (rev 3736) +++ trunk/jython/build.xml 2007-11-27 22:33:15 UTC (rev 3737) @@ -66,7 +66,7 @@ ht2html.dir=${basedir}/../externals/ht2html-2.0 # - define the home of the corresponding CPython version -python.home=c:/Programme/Python/Python22 +python.home=c:/Programme/Python/Python23 # - javax.servlet servlet.jar=c:/workspace/HEAD/CH.obj.commons.core/make_lib/j2ee.jar @@ -83,7 +83,7 @@ mysql.jar=${basedir}/../externals/external-jars/mysql-connector-java-3.0.16-ga-bin.jar postgresql.jar=${basedir}/../externals/external-jars/pg74.215.jdbc2.jar oracle.jar=C:/workspace/HEAD/for_development/bisdevsrv28/jboss/server/infra/lib/ojdbc14.jar -#informix.jar= +#informix.jar=${basedir}/../externals/external-jars/ifxjdbc.jar # - option for javac (build.compiler=modern is a global option to use standard jdk 1.3/1.4/1.5) #build.compiler=modern @@ -126,6 +126,7 @@ <target name="full-build" depends="full-init, dump-env, 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"> <property file="${user.home}/ant.properties" /> <property file="${basedir}/ant.properties" /> @@ -163,13 +164,6 @@ <available property="jndi.present" classname="javax.naming.Context" classpath="${jndi.jar}" /> <available property="javax.sql.present" classname="javax.sql.DataSource" /> <available property="jdbc30.present" classname="java.sql.ParameterMetaData" /> - <property name="work.dir" value="${basedir}" /> - <property name="jython.base.dir" value="${basedir}" /> - <property name="source.dir" value="${basedir}/src" /> - <property name="templates.dir" value="${basedir}/src/templates" /> - <property name="python.lib" value="${basedir}/CPythonLib" /> - <property name="bugtests.dir" value="${basedir}/bugtests" /> - <property name="templates.lazy" value="true" /> </target> <target name="full-init" depends="common-init"> @@ -179,10 +173,13 @@ <!-- predefined tags for jython and cpython --> <property name="svn.tag" value="Release_2_2beta2" /> + <!-- use different work and checkout directories --> <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" /> <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" /> @@ -196,7 +193,7 @@ <isset property="svn.revision" /> </condition> <property name="jython.version" value="2.2b2" /> - <property name="svn.revision" value="HEAD"/> + <property name="svn.revision" value="HEAD"/> <!-- classpath for svn ant task --> <path id="svn.classpath"> @@ -207,7 +204,7 @@ </path> <!-- taskdef for svn ant task --> <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> - <!-- Require all of the optional jars for a full build --> + <!-- Require all of the optional jars for a full build --> <fail unless="readline.present" message="readline jar not present" /> <fail unless="jline.present" message="jline jar not present" /> <fail unless="servlet.present" message="servlet jar not present" /> @@ -218,6 +215,14 @@ </target> <target name="init" depends="common-init"> + <property name="work.dir" value="${basedir}" /> + <property name="jython.base.dir" value="${basedir}" /> + <property name="source.dir" value="${basedir}/src" /> + <property name="templates.dir" value="${basedir}/src/templates" /> + <property name="python.lib" value="${basedir}/CPythonLib" /> + <property name="bugtests.dir" value="${basedir}/bugtests" /> + <property name="templates.lazy" value="true" /> + <property name="output.dir" value="${work.dir}/build" /> <property name="dist.dir" value="${work.dir}/dist" /> <property name="apidoc.dir" value="${dist.dir}/Doc/javadoc" /> @@ -249,6 +254,8 @@ <echo>output.dir = '${output.dir}'</echo> <echo>dist.dir = '${dist.dir}'</echo> <echo>apidoc.dir = '${apidoc.dir}'</echo> + <echo>templates.dir = '${templates.dir}'</echo> + <echo>templates.lazy = '${templates.lazy}'</echo> <echo>python.lib = '${python.lib}'</echo> <echo>javaccHome = '${javaccHome}'</echo> <echo>ht2html.dir = '${ht2html.dir}'</echo> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-12-08 23:27:24
|
Revision: 3779 http://jython.svn.sourceforge.net/jython/?rev=3779&view=rev Author: cgroves Date: 2007-12-08 15:27:20 -0800 (Sat, 08 Dec 2007) Log Message: ----------- Exclude the javatests directory from copying since we're getting its classes from compilation Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-12-08 21:12:36 UTC (rev 3778) +++ trunk/jython/build.xml 2007-12-08 23:27:20 UTC (rev 3779) @@ -568,10 +568,13 @@ </copy> <copy todir="${dist.dir}/Lib"> - <fileset dir="${jython.base.dir}/Lib" excludes="**/*.class"/> + <fileset dir="${jython.base.dir}/Lib"> + <exclude name="**/*.class"/> + <exclude name="**/javatests/"/> + </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"/> + <!-- 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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-12-10 05:02:00
|
Revision: 3787 http://jython.svn.sourceforge.net/jython/?rev=3787&view=rev Author: cgroves Date: 2007-12-09 21:01:59 -0800 (Sun, 09 Dec 2007) Log Message: ----------- include the tests in the jarred up source Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-12-10 04:59:48 UTC (rev 3786) +++ trunk/jython/build.xml 2007-12-10 05:01:59 UTC (rev 3787) @@ -539,7 +539,6 @@ <include name="src/**/*.java" /> <include name="src/com/**/*.properties" /> <include name="Lib/jxxload_help/*.java" /> - <include name="Lib/test/javatests/*.java" /> <include name="src/org/**/ucnhash.dat" /> <include name="src/org/python/parser/build.xml" /> <exclude name="src/org/python/parser/python.java" /> @@ -569,7 +568,6 @@ <copy todir="${dist.dir}/Lib"> <fileset dir="${jython.base.dir}/Lib"> <exclude name="**/*.class"/> - <exclude name="**/javatests/"/> </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. --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2007-12-30 01:50:31
|
Revision: 3897 http://jython.svn.sourceforge.net/jython/?rev=3897&view=rev Author: cgroves Date: 2007-12-29 17:50:28 -0800 (Sat, 29 Dec 2007) Log Message: ----------- Pull over the switch from svn.tag to svn.main.dir from branches/Release_2_2maint Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2007-12-29 05:13:46 UTC (rev 3896) +++ trunk/jython/build.xml 2007-12-30 01:50:28 UTC (rev 3897) @@ -11,9 +11,9 @@ 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) - - override svn.tag in ant.properties (if necessary) + - override svn.main.dir in ant.properties (if necessary) - call target 'full-build' -This build will create a working directory named full_build_${svn.tag} at the same +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. @@ -55,7 +55,6 @@ --------------------- http://wiki.python.org/jython/JythonDeveloperGuide/HowToReleaseJython - An example ant.properties file: ------------------------------- @@ -92,13 +91,21 @@ #optimize=off #deprecation=off -# - the svn tag to build from; only needed for full-build -#svn.tag=Release_2_2beta2 -#svn.tag=HEAD +# - the svn main directory to build from; only needed for full-build +# This e.g. could be one of: +# trunk +# branches/Release_2_2maint +# tags/Release_2_2rc3 +# meaning any directory just above the two directories: +# /installer +# /jython +# svn.main.dir defaults to trunk +#svn.main.dir=trunk -# - the revision; defaults to svn.tag; only needed for full-build -# (uncomment and indicate the correct revision to do a snapshot build) -#svn.revision=3245 +# - 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) +# For 'normal' builds, this defaults to the latest revision on svn.main.dir (HEAD) +#svn.revision=3444 # - the directory containing libsvnjavahl-1.dll (on windows) and svnjavahl.jar; only needed for full-build # how to get these: @@ -170,11 +177,10 @@ <!-- use this property to distinguish a full-build from a developer-build --> <property name="full-build" value="true" /> - <!-- predefined tags for jython and cpython --> - <property name="svn.tag" value="Release_2_2beta2" /> + <!-- predefined main directory for checkout --> + <property name="svn.main.dir" value="trunk" /> - <!-- use different work and checkout directories --> - <property name="work.dir" value="${basedir}/../full_build_${svn.tag}" /> + <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" /> @@ -192,7 +198,9 @@ <condition property="jython.version" value="${svn.revision}"> <isset property="svn.revision" /> </condition> - <property name="jython.version" value="2.2b2" /> + <property name="jython.version" value="2.3a0" /> + <!-- if not set so far, default svn.revision to HEAD, since we always want + the latest revision on the specified subversion main directory --> <property name="svn.revision" value="HEAD"/> <!-- classpath for svn ant task --> @@ -267,11 +275,11 @@ <echo>nowarn = '${nowarn}'</echo> <echo>--- properties (used for full-build only ) ---</echo> <echo>python.exe = '${python.exe}'</echo> - <echo>svn.tag = '${svn.tag}'</echo> + <echo>svn.main.dir = '${svn.main.dir}'</echo> + <echo>svn.revision = '${svn.revision}'</echo> <echo>svn.checkout.dir = '${svn.checkout.dir}'</echo> <echo>javahl.dir = '${javahl.dir}'</echo> <echo>svnant.jar.dir = '${svnant.jar.dir}'</echo> - <echo>svn.revision = '${svn.revision}'</echo> <echo>do.snapshot.build = '${do.snapshot.build}'</echo> <echo>do.checkout = '${do.checkout}'</echo> </target> @@ -324,11 +332,6 @@ </target> <target name="checkout" depends="prepare" if="do.checkout"> - <!-- determine if to checkout from /tags/${svn.tag} (any tag), or /trunk (HEAD) --> - <condition property="svn.main.dir" value="trunk"> - <equals arg1="${svn.tag}" arg2="HEAD" /> - </condition> - <property name="svn.main.dir" value="tags/${svn.tag}" /> <svn javahl="${javahl.dir}" > <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" /> <checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" /> @@ -579,7 +582,6 @@ <!-- wrap the build into the installer --> <target name="install" depends="version, doc, javadoc, jar, copy-full"> - <fail unless="svn.tag" message="no svn.tag specified" /> <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}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cg...@us...> - 2008-01-01 03:16:31
|
Revision: 3928 http://jython.svn.sourceforge.net/jython/?rev=3928&view=rev Author: cgroves Date: 2007-12-31 19:16:29 -0800 (Mon, 31 Dec 2007) Log Message: ----------- ant 1.6.5 finds using both the classpath and the classpathref attributes at the same time offensive Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-01-01 02:23:15 UTC (rev 3927) +++ trunk/jython/build.xml 2008-01-01 03:16:29 UTC (rev 3928) @@ -461,8 +461,12 @@ </target> <target name="expose" depends="init"> - <taskdef name="expose" classname="org.python.expose.generate.ExposeTask" - classpath="${compile.dir}" classpathref="main.classpath"/> + <taskdef name="expose" classname="org.python.expose.generate.ExposeTask"> + <classpath> + <path refid="main.classpath" /> + <pathelement path="${compile.dir}" /> + </classpath> + </taskdef> <expose srcdir="${compile.dir}" destdir="${exposed.dir}" includesfile="${jython.base.dir}/CoreExposed.includes"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |