From: <max...@us...> - 2006-02-08 07:59:49
|
Update of /cvsroot/hibernate/HibernateExt/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14945 Modified Files: common-build.xml Log Message: build of jar with tests for usage in eclipse testing Index: common-build.xml =================================================================== RCS file: /cvsroot/hibernate/HibernateExt/common/common-build.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- common-build.xml 15 Nov 2005 16:03:41 -0000 1.21 +++ common-build.xml 8 Feb 2006 07:59:41 -0000 1.22 @@ -15,6 +15,7 @@ <property name="lib.dir" location="lib"/> <property name="build.dir" location="build"/> <property name="classes.dir" location="${build.dir}/classes"/> + <property name="testclasses.dir" location="${build.dir}/testclasses"/> <property name="dist.target.dir" location="target"/> <property name="dist.dir" location="${dist.target.dir}/${name}"/> <property name="instrumenttest.out.dir" value="instrumenttestout"/> @@ -30,6 +31,7 @@ <property name="dist.lib.dir" location="${dist.dir}/lib"/> <property name="jar.name" value="${name}"/> <property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/> + <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/> <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/> <property name="javac.debug" value="on"/> @@ -109,7 +111,7 @@ </patternset> <!-- junit paths/filesets --> - <fileset dir="${classes.dir}" id="junit.batchtestset"> + <fileset dir="${testclasses.dir}" id="junit.batchtestset"> <include name="**/*Test.class"/> </fileset> @@ -127,6 +129,7 @@ <include name="*.jar"/> </fileset> <pathelement path="${classes.dir}"/> + <pathelement path="${testclasses.dir}"/> <path refid="lib.class.path"/> <path refid="junit.moduleclasspath"/> <path location="${clover.jar}"/> @@ -164,12 +167,14 @@ </tstamp> <echo message="Build ${Name}-${version} (${subversion})"/> <mkdir dir="${classes.dir}"/> + <mkdir dir="${testclasses.dir}"/> <copy todir="${classes.dir}"> <fileset dir="${src.dir}"> <patternset refid="support.files"/> </fileset> - </copy> - <copy todir="${build.dir}"> + </copy> + + <copy todir="${build.dir}"> <fileset dir="."> <include name="readme.txt"/> <include name="lgpl.txt"/> @@ -205,7 +210,9 @@ value="org.eclipse.jdt.core.JDTCompilerAdapter" classpath="${java.class.path}"/> <javac - destdir="${classes.dir}" + target="1.4" + source="1.4" + destdir="${testclasses.dir}" classpathref="junit.classpath" debug="${javac.debug}" optimize="${javac.optimize}" @@ -219,11 +226,12 @@ <taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask"> <classpath path="${classes.dir}"/> + <classpath path="${testclasses.dir}"/> <classpath refid="lib.class.path"/> </taskdef> <instrument verbose="true"> - <fileset dir="${classes.dir}/org/hibernate/test"> + <fileset dir="${testclasses.dir}/org/hibernate/test"> <include name="**/*.class"/> <exclude name="**/*Test$*.class"/> <exclude name="**/*Test.class"/> @@ -294,6 +302,11 @@ <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/> </target> + <target name="jartest" depends="compiletest" description="Build the distribution .jar file"> + <mkdir dir="${dist.dir}"/> + <jar filesetmanifest="merge" jarfile="${jartest.file.name}" basedir="${testclasses.dir}"/> + </target> + <!-- DOCUMENTATION --> <target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> |