From: <aki...@us...> - 2010-06-14 17:27:27
|
Revision: 8391 http://gridarta.svn.sourceforge.net/gridarta/?rev=8391&view=rev Author: akirschbaum Date: 2010-06-14 17:27:20 +0000 (Mon, 14 Jun 2010) Log Message: ----------- Update top-level build file. Modified Paths: -------------- trunk/INSTALL trunk/build.xml trunk/project.properties Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - classes dest developer.properties docs gridarta.iws out + classes dest developer.properties docs gridarta.iws out AtrinikEditor.jar CrossfireEditor.jar DaimoninEditor.jar Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2010-06-13 23:34:24 UTC (rev 8390) +++ trunk/INSTALL 2010-06-14 17:27:20 UTC (rev 8391) @@ -21,22 +21,11 @@ How to Build ------------ -Change to the directory of the version you want to build and run "ant". -To find out options about building Gridarta, run "ant -projecthelp". +Run "ant" to build the editor. This builds AtrinikEditor.jar, +CrossfireEditor.jar, and DaimoninEditor.jar. To find out options about building +Gridarta, run "ant -projecthelp". -Example: Building Gridarta4Atrinik -cd atrinik/ -ant -Example: Building Gridarta4Crossfire -cd crossfire/ -ant - -Example: Building Gridarta4Daimonin -cd daimonin/ -ant - - How to Run ---------- java -jar AtrinikEditor.jar @@ -47,4 +36,4 @@ How to Generate Documentation (Javadoc) --------------------------------------- Change to the main directory and run "ant javadoc". The documentation will be -placed in dest/doc/api/. +placed in dest/doc/dev/api/. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-06-13 23:34:24 UTC (rev 8390) +++ trunk/build.xml 2010-06-14 17:27:20 UTC (rev 8391) @@ -18,7 +18,7 @@ --> <!DOCTYPE project [<!ENTITY catalogForAnt SYSTEM "src/doc/dtd/catalogForAnt.xml">]> -<project default="compile"> +<project default="jar"> <description> Build file for Gridarta - 2D MMORPG Map Editor. @@ -83,41 +83,398 @@ <delete dir="dest"/> <delete dir="dist"/> <delete file="src/doc/dev/SafeCopy.java.xhtml"/> + <delete file="src/doc/dev/changelog.xml"/> <delete dir="docs"/> <delete dir="classes"/> + <delete file="AtrinikEditor.jar"/> + <delete file="CrossfireEditor.jar"/> + <delete file="DaimoninEditor.jar"/> </target> - <target name="compile" description="Compiles the Gridarta sources."> - <mkdir dir="dest/app"/> - <javac srcdir="src/app:textedit/src/app:utils/src/app:model/src/app:atrinik/src/app:crossfire/src/app:daimonin/src/app:preferences/src/app" destdir="dest/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <target name="jar" description="Creates AtrinikEditor.jar, CrossfireEditor.jar, and DaimoninEditor.jar" depends="jar-atrinik,jar-crossfire,jar-daimonin"/> + + <target name="jar-atrinik" description="Creates AtrinikEditor.jar" depends="compile-atrinik,init-properties"> + <jar destfile="AtrinikEditor.jar" index="true"> + <fileset dir="dest/atrinik/app"/> + <fileset dir="dest/gridarta/app"/> + <fileset dir="dest/model/app"/> + <fileset dir="dest/preferences/app"/> + <fileset dir="dest/textedit/app"/> + <fileset dir="dest/utils/app"/> + <fileset dir="dest" includes="build.properties"/> + <fileset file="COPYING"/> + <fileset dir="atrinik/lib"> + <include name="*-LICENSE"/> + </fileset> + <fileset dir="lib"> + <include name="bsh-LICENSE"/> + <include name="japi.jar-LICENSE"/> + <include name="java-getopt-1.0.13.jar-LICENSE"/> + <include name="jdom.jar-LICENSE"/> + <include name="log4j-1.2.13.jar-LICENSE"/> + </fileset> + <fileset dir="resource"/> + <fileset dir="atrinik/resource"/> + <zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/java-getopt-1.0.13.jar"/> + <zipfileset src="lib/jdom.jar"/> + <zipfileset src="lib/log4j-1.2.13.jar"/> + <zipgroupfileset dir="lib/" includes="japi-*.jar"/> + <manifest> + <attribute name="Main-Class" value="net.sf.gridarta.var.atrinik.maincontrol.AtrinikEditor"/> + <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/> + </manifest> + </jar> + </target> + + <target name="jar-crossfire" description="Creates CrossfireEditor.jar" depends="compile-crossfire,init-properties"> + <jar destfile="CrossfireEditor.jar" index="true"> + <fileset dir="dest/crossfire/app"/> + <fileset dir="dest/gridarta/app"/> + <fileset dir="dest/model/app"/> + <fileset dir="dest/preferences/app"/> + <fileset dir="dest/textedit/app"/> + <fileset dir="dest/utils/app"/> + <fileset dir="dest" includes="build.properties"/> + <fileset file="COPYING"/> + <fileset dir="crossfire/lib"> + <include name="*-LICENSE"/> + </fileset> + <fileset dir="lib"> + <include name="bsh-LICENSE"/> + <include name="japi.jar-LICENSE"/> + <include name="java-getopt-1.0.13.jar-LICENSE"/> + <include name="jdom.jar-LICENSE"/> + <include name="log4j-1.2.13.jar-LICENSE"/> + </fileset> + <fileset dir="resource"/> + <fileset dir="crossfire/resource"/> + <zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/java-getopt-1.0.13.jar"/> + <zipfileset src="lib/jdom.jar" excludes="META-INF/**"/> + <zipfileset src="lib/log4j-1.2.13.jar"/> + <zipgroupfileset dir="lib/" includes="japi-*.jar"/> + <manifest> + <attribute name="Main-Class" value="net.sf.gridarta.var.crossfire.maincontrol.CrossfireEditor"/> + <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/> + </manifest> + </jar> + </target> + + <target name="jar-daimonin" description="Creates DaimoninEditor.jar" depends="compile-daimonin,init-properties"> + <jar destfile="DaimoninEditor.jar" index="true"> + <fileset dir="dest/daimonin/app"/> + <fileset dir="dest/gridarta/app"/> + <fileset dir="dest/model/app"/> + <fileset dir="dest/textedit/app"/> + <fileset dir="dest/utils/app"/> + <fileset dir="dest" includes="build.properties"/> + <fileset file="COPYING"/> + <fileset dir="daimonin/lib"> + <include name="*-LICENSE"/> + </fileset> + <fileset dir="lib"> + <include name="bsh-LICENSE"/> + <include name="japi.jar-LICENSE"/> + <include name="java-getopt-1.0.13.jar-LICENSE"/> + <include name="jdom.jar-LICENSE"/> + <include name="log4j-1.2.13.jar-LICENSE"/> + </fileset> + <fileset dir="resource"/> + <fileset dir="daimonin/resource"/> + <zipfileset src="lib/bsh-classgen-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-commands-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-core-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/bsh-util-2.0b4.jar" excludes="META-INF/**"/> + <zipfileset src="lib/java-getopt-1.0.13.jar"/> + <zipfileset src="lib/jdom.jar"/> + <zipfileset src="lib/log4j-1.2.13.jar"/> + <zipgroupfileset dir="lib/" includes="japi-*.jar"/> + <manifest> + <attribute name="Main-Class" value="net.sf.gridarta.var.daimonin.maincontrol.DaimoninEditor"/> + <attribute name="SplashScreen-Image" value="icons/CFIntro.gif"/> + </manifest> + </jar> + </target> + + <target name="init-properties"> + <property file="developer.properties"/> + <property name="build.source.version" value="1.5"/> + <property name="build.target.version" value="${build.source.version}"/> + <property name="build.source.encoding" value="utf-8"/> + <property name="debug" value="false"/> + <property name="build.developer" value="unknown"/> + <property name="javac.args" value="-Xlint:all,-path,-unchecked,-fallthrough,-serial,-deprecation"/> + <property name="javac.fork" value="no"/> + <tstamp> + <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC"/> + </tstamp> + <exec executable="svnversion" outputproperty="build.number" failifexecutionfails="false"/> + <property name="build.number" value="unknown"/> + <echoproperties destfile="dest/build.properties"> + <propertyset> + <propertyref prefix="build.developer"/> + <propertyref prefix="build.number"/> + <propertyref prefix="build.tstamp"/> + <propertyref prefix="svnversion"/> + </propertyset> + </echoproperties> + </target> + + <target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-utils"> + <mkdir dir="dest/atrinik/app"/> + <javac srcdir="atrinik/src/app" destdir="dest/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> <classpath> <fileset dir="lib" includes="annotations.jar"/> - <fileset dir="lib" includes="bsh-classgen-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-commands-2.0b4.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> + <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/gridarta/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/preferences/app"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/atrinik/test"/> + <javac srcdir="atrinik/src/test" destdir="dest/atrinik/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/atrinik/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/atrinik/app"> + <fileset dir="atrinik/src/app" includes="**/*.properties"/> + </copy> + </target> + + <target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-utils"> + <mkdir dir="dest/crossfire/app"/> + <javac srcdir="crossfire/src/app" destdir="dest/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> + <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/gridarta/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/preferences/app"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/crossfire/test"/> + <javac srcdir="crossfire/src/test" destdir="dest/crossfire/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/crossfire/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/crossfire/app"> + <fileset dir="crossfire/src/app" includes="**/*.properties"/> + </copy> + </target> + + <target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-utils"> + <mkdir dir="dest/daimonin/app"/> + <javac srcdir="daimonin/src/app" destdir="dest/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> + <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/gridarta/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/daimonin/test"/> + <javac srcdir="daimonin/src/test" destdir="dest/daimonin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/daimonin/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/daimonin/app"> + <fileset dir="daimonin/src/app" includes="**/*.properties"/> + </copy> + </target> + + <target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-textedit,compile-utils"> + <mkdir dir="dest/gridarta/app"/> + <javac srcdir="src/app" destdir="dest/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> <fileset dir="lib" includes="bsh-core-2.0b4.jar"/> <fileset dir="lib" includes="bsh-util-2.0b4.jar"/> - <fileset dir="lib" includes="japi-lib-lang-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-swing-about-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-extlib-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-swing-tod-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> - <fileset dir="lib" includes="japi-lib-xml-0.1.0.jar"/> <fileset dir="lib" includes="java-getopt-1.0.13.jar"/> <fileset dir="lib" includes="jdom.jar"/> <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/textedit/app"/> + <pathelement location="dest/utils/app"/> </classpath> <compilerarg line="${javac.args}"/> </javac> - <copy todir="dest/app"> + <mkdir dir="dest/gridarta/test"/> + <javac srcdir="src/test" destdir="dest/gridarta/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/gridarta/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/gridarta/app"> <fileset dir="src/app" includes="**/*.properties,cfpython_menu.def"/> </copy> </target> - <target name="doc" depends="editorialDoc, apiDoc" description="Creates project documentation."/> + <target name="compile-model" description="Compiles the model module." depends="compile-utils"> + <mkdir dir="dest/model/app"/> + <javac srcdir="model/src/app" destdir="dest/model/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> + <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="japi-lib-xml-0.1.0.jar"/> + <fileset dir="lib" includes="jdom.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/model/test"/> + <javac srcdir="model/src/test" destdir="dest/model/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/model/app"> + <fileset dir="model/src/app" includes="**/*.properties"/> + </copy> + </target> + <target name="compile-preferences" description="Compiles the preferences module."> + <mkdir dir="dest/preferences/app"/> + <javac srcdir="preferences/src/app" destdir="dest/preferences/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/preferences/test"/> + <javac srcdir="preferences/src/test" destdir="dest/preferences/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/preferences/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/preferences/app"> + <fileset dir="preferences/src/app" includes="**/*.properties"/> + </copy> + </target> + + <target name="compile-textedit" description="Compiles the textedit module." depends="compile-utils"> + <mkdir dir="dest/textedit/app"/> + <javac srcdir="textedit/src/app" destdir="dest/textedit/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/textedit/test"/> + <javac srcdir="textedit/src/test" destdir="dest/textedit/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/textedit/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/textedit/app"> + <fileset dir="textedit/src/app" includes="**/*.properties"/> + </copy> + </target> + + <target name="compile-utils" description="Compiles the utils module."> + <mkdir dir="dest/utils/app"/> + <javac srcdir="utils/src/app" destdir="dest/utils/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> + <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <mkdir dir="dest/utils/test"/> + <javac srcdir="utils/src/test" destdir="dest/utils/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <classpath> + <fileset dir="lib" includes="annotations.jar"/> + <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/utils/app"/> + </classpath> + <compilerarg line="${javac.args}"/> + </javac> + <copy todir="dest/utils/app"> + <fileset dir="utils/src/app" includes="**/*.properties"/> + </copy> + </target> + + <target name="doc" depends="editorialDoc,apiDoc" description="Creates project documentation."/> + <target name="java2html" description="Converts documentation java sources to XHTML."> <taskdef name="java2html" classpath="lib/java2html.jar" classname="de.java2html.anttasks.Java2HtmlTask"/> <java2html srcdir="src/doc" destdir="src/doc" includes="**/*.java" outputformat="xhtml11" tabs="4" style="eclipse" addlineanchors="true" includedocumentfooter="true" includedocumentheader="true" lineanchorprefix="line" showdefaulttitle="true" showfilename="true" showlinenumbers="true" showtableborder="true"/> @@ -157,45 +514,50 @@ <target name="apiDoc" description="Creates public javadoc documentation."> <mkdir dir="dest/doc/api/${project.version}"/> - <!-- <copy todir="dest/doc/api/${project.version}" file="src/doc/api/public/copyright.html"/> --> - <!-- <copy todir="dest/doc/api/${project.version}" file="src/doc/api/public/.htaccess"/> --> - <javadoc destdir="dest/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.html">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="src/app/overview.html" link="${user.javadoc.link}"> + <copy todir="dest/doc/api/${project.version}" file="src/doc/copyright.xhtml"/> + <copy todir="dest/doc/api/${project.version}" file="src/doc/dev/api/.htaccess"/> + <javadoc destdir="dest/doc/api/${project.version}" access="protected" author="yes" version="yes" locale="en_US" use="yes" splitindex="yes" windowtitle="Gridarta API documentation" doctitle="Gridarta<br />Yet another Java API<br />API Documentation" header="Gridarta ${project.version}<br />Yet another Java API<br />API Documentation" footer="Gridarta<br />Yet another Java API<br />API Documentation" bottom="<div style="text-align:center;">© 2005-2006 The Gridarta Developers. All rights reserved. See <a href="{@docRoot}/copyright.xhtml">copyright</a></div>" serialwarn="yes" charset="${build.source.encoding}" docencoding="${build.source.encoding}" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" overview="src/app/overview.html" link="${user.javadoc.link}"> <classpath> - <fileset dir="lib" includes="annotations.jar"/> - <fileset dir="lib" includes="bsh-classgen-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-commands-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-core-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-util-2.0b4.jar"/> - <fileset dir="lib" includes="japi-lib-lang-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-about-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-extlib-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> - <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-tod-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> - <fileset dir="lib" includes="japi-lib-xml-0.1.0.jar"/> - <fileset dir="lib" includes="java-getopt-1.0.13.jar"/> - <fileset dir="lib" includes="jdom.jar"/> - <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/> + <fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/> + <fileset dir="crossfire/lib" includes="*.jar" excludes="*.jar-LICENSE"/> + <fileset dir="lib" includes="*.jar" excludes="*.jar-LICENSE"/> </classpath> <sourcepath> <pathelement path="${user.javadoc.javasrc}"/> <pathelement path="src/app"/> - <pathelement path="textedit/src/app"/> - <pathelement path="utils/src/app"/> - <pathelement path="model/src/app"/> + <pathelement path="src/test"/> <pathelement path="atrinik/src/app"/> + <pathelement path="atrinik/src/test"/> <pathelement path="crossfire/src/app"/> + <pathelement path="crossfire/src/test"/> <pathelement path="daimonin/src/app"/> + <pathelement path="daimonin/src/test"/> + <pathelement path="model/src/app"/> + <pathelement path="model/src/test"/> + <pathelement path="preferences/src/app"/> + <pathelement path="preferences/src/test"/> + <pathelement path="textedit/src/app"/> + <pathelement path="textedit/src/test"/> + <pathelement path="utils/src/app"/> + <pathelement path="utils/src/test"/> </sourcepath> <packageset dir="src/app" defaultexcludes="yes"/> - <packageset dir="textedit/src/app" defaultexcludes="yes"/> - <packageset dir="utils/src/app" defaultexcludes="yes"/> - <packageset dir="model/src/app" defaultexcludes="yes"/> + <packageset dir="src/test" defaultexcludes="yes"/> <packageset dir="atrinik/src/app" defaultexcludes="yes"/> + <packageset dir="atrinik/src/test" defaultexcludes="yes"/> <packageset dir="crossfire/src/app" defaultexcludes="yes"/> + <packageset dir="crossfire/src/test" defaultexcludes="yes"/> <packageset dir="daimonin/src/app" defaultexcludes="yes"/> + <packageset dir="daimonin/src/test" defaultexcludes="yes"/> + <packageset dir="model/src/app" defaultexcludes="yes"/> + <packageset dir="model/src/test" defaultexcludes="yes"/> + <packageset dir="preferences/src/app" defaultexcludes="yes"/> + <packageset dir="preferences/src/test" defaultexcludes="yes"/> + <packageset dir="textedit/src/app" defaultexcludes="yes"/> + <packageset dir="textedit/src/test" defaultexcludes="yes"/> + <packageset dir="utils/src/app" defaultexcludes="yes"/> + <packageset dir="utils/src/test" defaultexcludes="yes"/> <tag name="todo" description="Todo:"/> <tag name="used" description="Manually marked as used." enabled="false"/> <tag name="fixme" description="Fixme:"/> @@ -211,7 +573,7 @@ </javadoc> </target> - <target name="dist" description="Packs distribution archives." depends="distSrc, distLib, distDoc"/> + <target name="dist" description="Packs distribution archives." depends="distSrc,distLib,distDoc"/> <target name="distSrc" description="Packs source distribution archives."> <mkdir dir="dist"/> @@ -243,7 +605,7 @@ <delete file="${distSrc}.tar"/> </target> - <target name="distLib" description="Packs library distribution archives." depends="compile"> + <target name="distLib" description="Packs library distribution archives."> <!--XXX:depends="compile"--> <mkdir dir="dist"/> <property name="distLib" value="dist/gridarta-${project.version}.lib"/> <jar destfile="${distLib}.jar"> @@ -285,15 +647,15 @@ <delete file="${distDoc}.tar"/> </target> - <target name="checkDevMail" description="checks whether the developer defined his / her email address" unless="developer.email"> + <target name="checkDevMail" description="Checks whether the developer defined his / her email address." unless="developer.email"> <fail message="You must define the property developer.email with your email address in the file developer.properties."/> </target> - <target name="checkDevSmtp" description="checks whether the developer defined his / her smtp host" unless="user.mail.smtp.host"> + <target name="checkDevSmtp" description="Checks whether the developer defined his / her smtp host." unless="user.mail.smtp.host"> <fail message="You must define the property user.mail.smtp.host with your smtp host address in the file developer.properties."/> </target> - <target name="releaseDist" description="uploads distribution archives to sourceforge." if="developer.email" depends="checkDevMail, dist"> + <target name="releaseDist" description="Uploads distribution archives to sourceforge." if="developer.email" depends="checkDevMail, dist"> <touch file="src/doc/api/start.xhtml" millis="0"/> <megaxslt srcdir="src/doc/api" destdir="src/doc/api" includes="start.xhtml" validatesource="true" validatedest="true" ending="xhtml" converttocanonical="true" checktimestamps="true"> <xmlcatalog refid="commonDTDs"/> @@ -315,10 +677,9 @@ <antcall target="uploadDoc"/> </target> - <target name="uploadDoc" description="uploads the latest editorial documentation." depends="editorialDoc"> + <target name="uploadDoc" description="Uploads the latest editorial documentation." depends="editorialDoc"> <exec executable="rsync" failonerror="true"> - <!--arg line="-auzv - -exclude=api/*/ -e ssh dest/doc/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/" /--> - <arg line="-auzv -e ssh dest/doc/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/"/> + <arg line="-auzv-e ssh dest/doc/ ${user.rsync.username}@${user.rsync.host}:${user.rsync.dir}/htdocs/"/> </exec> </target> @@ -360,7 +721,7 @@ </svn> </target> - <target name="checkstyle" description="Runs checkstyle to stylecheck the source code"> + <target name="checkstyle" description="Runs checkstyle to style-check the source code"> <taskdef resource="checkstyletask.properties" classpath="lib/checkstyle-all-5.0.jar"> <classpath> <pathelement path="lib/antlr.jar"/> @@ -373,21 +734,24 @@ <formatter type="plain"/> <fileset dir="src/app" includes="**/*.java"/> <fileset dir="src/test" includes="**/*.java"/> - <fileset dir="textedit/src/app" includes="**/*.java"/> - <fileset dir="utils/src/app" includes="**/*.java"/> - <fileset dir="utils/src/test" includes="**/*.java"/> - <fileset dir="model/src/app" includes="**/*.java"/> - <fileset dir="model/src/test" includes="**/*.java"/> <fileset dir="atrinik/src/app" includes="**/*.java"/> <fileset dir="atrinik/src/test" includes="**/*.java"/> <fileset dir="crossfire/src/app" includes="**/*.java"/> <fileset dir="crossfire/src/test" includes="**/*.java"/> <fileset dir="daimonin/src/app" includes="**/*.java"/> <fileset dir="daimonin/src/test" includes="**/*.java"/> + <fileset dir="model/src/app" includes="**/*.java"/> + <fileset dir="model/src/test" includes="**/*.java"/> + <fileset dir="preferences/src/app" includes="**/*.java"/> + <fileset dir="preferences/src/test" includes="**/*.java"/> + <fileset dir="textedit/src/app" includes="**/*.java"/> + <fileset dir="textedit/src/test" includes="**/*.java"/> + <fileset dir="utils/src/app" includes="**/*.java"/> + <fileset dir="utils/src/test" includes="**/*.java"/> </checkstyle> </target> - <target name="mailCheckstyle" description="Mails checkstyle results to the mailing list" depends="checkstyle, checkDevMail, checkDevSmtp"> + <target name="mailCheckstyle" description="Mails checkstyle results to the mailing list" depends="checkstyle,checkDevMail,checkDevSmtp"> <mail from="${developer.email}" tolist="gri...@li..." mailhost="${user.mail.smtp.host}" subject="Checkstyle violation(s) in Gridarta" files="checkstyle_report.html"/> </target> @@ -401,10 +765,9 @@ </megaxslt> </target> - <target name="javadoc" description="Creates the JavaDoc documentation for the complete editor source."> - <exec executable="svnversion" outputproperty="build.number"/> + <target name="javadoc" depends="init-properties" description="Creates the JavaDoc documentation for the complete editor source."> <mkdir dir="dest/doc/dev/api"/> - <javadoc destdir="dest/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta Editor — API Documentation" doctitle="Gridarta Editor ${build.number}<br />API Documentation" header="Gridarta Editor ${build.number}<br />API Documentation" footer="Gridarta Editor ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="src/app/overview.html" link="${user.javadoc.link}"> + <javadoc destdir="dest/doc/dev/api" locale="en_US" version="yes" author="yes" use="yes" splitindex="yes" windowtitle="Gridarta — API Documentation" doctitle="Gridarta ${build.number}<br />API Documentation" header="Gridarta ${build.number}<br />API Documentation" footer="Gridarta ${build.number}<br />API Documentation" serialwarn="no" charset="utf-8" docencoding="utf-8" source="${build.source.version}" encoding="${build.source.encoding}" linksource="yes" private="yes" overview="src/app/overview.html" link="${user.javadoc.link}"> <classpath> <fileset dir="atrinik/lib" includes="*.jar" excludes="*.jar-LICENSE"/> <fileset dir="daimonin/lib" includes="*.jar" excludes="*.jar-LICENSE"/> @@ -415,31 +778,37 @@ <pathelement path="${user.javadoc.javasrc}"/> <pathelement path="src/app"/> <pathelement path="src/test"/> - <pathelement path="textedit/src/app"/> - <pathelement path="utils/src/app"/> - <pathelement path="utils/src/test"/> - <pathelement path="model/src/app"/> - <pathelement path="model/src/test"/> <pathelement path="atrinik/src/app"/> <pathelement path="atrinik/src/test"/> <pathelement path="crossfire/src/app"/> <pathelement path="crossfire/src/test"/> <pathelement path="daimonin/src/app"/> <pathelement path="daimonin/src/test"/> + <pathelement path="model/src/app"/> + <pathelement path="model/src/test"/> + <pathelement path="preferences/src/app"/> + <pathelement path="preferences/src/test"/> + <pathelement path="textedit/src/app"/> + <pathelement path="textedit/src/test"/> + <pathelement path="utils/src/app"/> + <pathelement path="utils/src/test"/> </sourcepath> <packageset dir="src/app" defaultexcludes="yes"/> <packageset dir="src/test" defaultexcludes="yes"/> - <packageset dir="textedit/src/app" defaultexcludes="yes"/> - <packageset dir="utils/src/app" defaultexcludes="yes"/> - <packageset dir="utils/src/test" defaultexcludes="yes"/> - <packageset dir="model/src/app" defaultexcludes="yes"/> - <packageset dir="model/src/test" defaultexcludes="yes"/> <packageset dir="atrinik/src/app" defaultexcludes="yes"/> <packageset dir="atrinik/src/test" defaultexcludes="yes"/> <packageset dir="crossfire/src/app" defaultexcludes="yes"/> <packageset dir="crossfire/src/test" defaultexcludes="yes"/> <packageset dir="daimonin/src/app" defaultexcludes="yes"/> <packageset dir="daimonin/src/test" defaultexcludes="yes"/> + <packageset dir="model/src/app" defaultexcludes="yes"/> + <packageset dir="model/src/test" defaultexcludes="yes"/> + <packageset dir="preferences/src/app" defaultexcludes="yes"/> + <packageset dir="preferences/src/test" defaultexcludes="yes"/> + <packageset dir="textedit/src/app" defaultexcludes="yes"/> + <packageset dir="textedit/src/test" defaultexcludes="yes"/> + <packageset dir="utils/src/app" defaultexcludes="yes"/> + <packageset dir="utils/src/test" defaultexcludes="yes"/> <bottom> <![CDATA[<address> <a href="http://sourceforge.net/"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=166996&type=1" alt="SourceForge.net Logo" width="88" height="31" class="now" /></a> @@ -450,7 +819,7 @@ Feedback: <a href="mailto:ch...@ri...">webmaster</a> </address> <p class="copyright"> - © 2003-2007 The Gridarta Developers. All rights reserved. + © 2003-2010 The Gridarta Developers. All rights reserved. </p>]]> </bottom> <tag name="todo" description="Todo:"/> @@ -468,99 +837,196 @@ </javadoc> </target> - <target name="test" description="executes the junit tests." depends="compile"> - <mkdir dir="classes/test"/> + <target name="test" description="Executes the junit tests." depends="test-atrinik,test-crossfire,test-daimonin,test-gridarta,test-model,test-preferences,test-textedit,test-utils"> + <junitreport todir="docs/test"> + <fileset dir="docs/test"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="docs/test"/> + </junitreport> + </target> + + <target name="test-atrinik" depends="compile-atrinik"> <mkdir dir="docs/test"/> - <javac srcdir="src/test:model/src/test:utils/src/test:atrinik/src/test:crossfire/src/test:daimonin/src/test" destdir="classes/test" encoding="utf-8" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes"> + <junit printsummary="no" haltonfailure="yes"> <classpath> - <fileset dir="lib" includes="annotations.jar"/> - <fileset dir="lib" includes="bsh-classgen-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-commands-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-core-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-util-2.0b4.jar"/> - <fileset dir="lib" includes="japi-lib-lang-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-about-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-extlib-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> - <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-tod-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> - <fileset dir="lib" includes="japi-lib-xml-0.1.0.jar"/> - <fileset dir="lib" includes="java-getopt-1.0.13.jar"/> - <fileset dir="lib" includes="jdom.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/atrinik/app"/> + <pathelement location="dest/atrinik/test"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/atrinik/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-crossfire" depends="compile-crossfire"> + <mkdir dir="docs/test"/> + <junit printsummary="no" haltonfailure="yes"> + <classpath> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> <fileset dir="lib" includes="log4j-1.2.13.jar"/> - <pathelement location="dest/app"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/crossfire/app"/> + <pathelement location="dest/crossfire/test"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> </classpath> - <include name="**/*.java"/> - <exclude name="**/package-info.java"/> - </javac> - <copy todir="classes/test"> - <fileset dir="resource" includes="**/*.properties,**/*.dtd"/> - <fileset dir="src/test" includes="**/*.properties,**/*.testdata"/> - <fileset dir="src/app" includes="**/*.properties,**/*.testdata"/> - <fileset dir="textedit/src/app" includes="**/*.properties,**/*.testdata"/> - <fileset dir="utils/src/app" includes="**/*.properties,**/*.testdata"/> - <fileset dir="utils/src/test" includes="**/*.properties,**/*.testdata"/> - <fileset dir="model/src/app" includes="**/*.properties,**/*.testdata"/> - <fileset dir="model/src/test" includes="**/*.properties,**/*.testdata"/> - <fileset dir="atrinik/src/test" includes="**/*.properties,**/*.testdata"/> - <fileset dir="atrinik/src/app" includes="**/*.properties,**/*.testdata"/> - <fileset dir="crossfire/src/test" includes="**/*.properties,**/*.testdata"/> - <fileset dir="crossfire/src/app" includes="**/*.properties,**/*.testdata"/> - <fileset dir="daimonin/src/test" includes="**/*.properties,**/*.testdata"/> - <fileset dir="daimonin/src/app" includes="**/*.properties,**/*.testdata"/> - </copy> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/crossfire/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-daimonin" depends="compile-daimonin"> + <mkdir dir="docs/test"/> <junit printsummary="no" haltonfailure="yes"> <classpath> - <fileset dir="lib" includes="annotations.jar"/> - <fileset dir="lib" includes="bsh-classgen-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-commands-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-core-2.0b4.jar"/> - <fileset dir="lib" includes="bsh-util-2.0b4.jar"/> - <fileset dir="lib" includes="japi-lib-lang-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-about-0.1.0.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/daimonin/app"/> + <pathelement location="dest/daimonin/test"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/utils/app"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/daimonin/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-gridarta" depends="compile-gridarta"> + <mkdir dir="docs/test"/> + <junit printsummary="no" haltonfailure="yes"> + <classpath> <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-extlib-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-misc-trunk-1398.jar"/> - <fileset dir="lib" includes="japi-lib-swing-prefs-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-swing-tod-0.1.0.jar"/> - <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/gridarta/app"/> + <pathelement location="dest/gridarta/test"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/gridarta/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="test-model" depends="compile-model"> + <mkdir dir="docs/test"/> + <junit printsummary="no" haltonfailure="yes"> + <classpath> + <fileset dir="lib" includes="japi-lib-swing-action-0.1.0.jar"/> <fileset dir="lib" includes="japi-lib-xml-0.1.0.jar"/> - <fileset dir="lib" includes="java-getopt-1.0.13.jar"/> - <fileset dir="lib" includes="jdom.jar"/> + <fileset dir="lib" includes="log4j-1.2.13.jar"/> <fileset dir="lib" includes="junit-4.2.jar"/> - <fileset dir="lib" includes="log4j-1.2.13.jar"/> - <pathelement location="classes/test"/> - <pathelement location="dest/app"/> + <pathelement location="dest/model/app"/> + <pathelement location="dest/model/test"/> + <pathelement location="dest/utils/app"/> + <pathelement location="resource"/> </classpath> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="docs/test"> - <fileset dir="src/test"> - <include name="**/*Test.java"/> - <exclude name="**/Abstract*Test.java"/> + <fileset dir="dest/model/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> </fileset> - <fileset dir="atrinik/src/test"> - <include name="**/*Test.java"/> - <exclude name="**/Abstract*Test.java"/> + </batchtest> + </junit> + </target> + + <target name="test-preferences" depends="compile-preferences"> + <mkdir dir="docs/test"/> + <junit printsummary="no" haltonfailure="yes"> + <classpath> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/preferences/app"/> + <pathelement location="dest/preferences/test"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/preferences/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> </fileset> - <fileset dir="crossfire/src/test"> - <include name="**/*Test.java"/> - <exclude name="**/Abstract*Test.java"/> + </batchtest> + </junit> + </target> + + <target name="test-textedit" depends="compile-textedit"> + <mkdir dir="docs/test"/> + <junit printsummary="no" haltonfailure="yes"> + <classpath> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/textedit/app"/> + <pathelement location="dest/textedit/test"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/textedit/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> </fileset> - <fileset dir="daimonin/src/test"> - <include name="**/*Test.java"/> - <exclude name="**/Abstract*Test.java"/> + </batchtest> + </junit> + </target> + + <target name="test-utils" depends="compile-utils"> + <mkdir dir="docs/test"/> + <junit printsummary="no" haltonfailure="yes"> + <classpath> + <fileset dir="lib" includes="japi-lib-util-trunk-1379.jar"/> + <fileset dir="lib" includes="junit-4.2.jar"/> + <pathelement location="dest/utils/app"/> + <pathelement location="dest/utils/test"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest todir="docs/test"> + <fileset dir="dest/utils/test"> + <include name="**/*Test.class"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*Test.class"/> </fileset> </batchtest> </junit> - <junitreport todir="docs/test"> - <fileset dir="docs/test"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="docs/test"/> - </junitreport> </target> + </project> Modified: trunk/project.properties =================================================================== --- trunk/project.properties 2010-06-13 23:34:24 UTC (rev 8390) +++ trunk/project.properties 2010-06-14 17:27:20 UTC (rev 8391) @@ -18,7 +18,7 @@ # project.version.major=0 -project.version.minor=1 +project.version.minor=9 project.version.patch=0 project.version=${project.version.major}.${project.version.minor}.${project.version.patch} project.focus=majorEnhancements This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |