[hibernate-commits] Hibernate SVN: r15403 - search/trunk.

Author: hardy.ferentschik Date: 2008-10-27 10:35:50 -0400 (Mon, 27 Oct 2008) New Revision: 15403 Modified: search/trunk/build.properties.dist search/trunk/build.xml search/trunk/common-build.xml Log: Allow the tests to be run from the built distribution. Modified: search/trunk/build.properties.dist =================================================================== --- search/trunk/build.properties.dist 2008-10-27 14:00:13 UTC (rev 15402) +++ search/trunk/build.properties.dist 2008-10-27 14:35:50 UTC (rev 15403) @@ -1,4 +1,6 @@ common.dir=. src.dir=src test.dir=test -testresources.dir=test-resources \ No newline at end of file +filter.dir=filters +testresources.dir=test-resources +test.resources.dir=test-resources \ No newline at end of file Modified: search/trunk/build.xml =================================================================== --- search/trunk/build.xml 2008-10-27 14:00:13 UTC (rev 15402) +++ search/trunk/build.xml 2008-10-27 14:35:50 UTC (rev 15403) @@ -37,12 +37,11 @@ <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> - <import file="${common.dir}/common-build.xml"/> - - <property name="build.testresources.dir" value="${build.dir}/testresources"/> <property name="testresources.dir" value="${basedir}/src/test-resources"/> + <import file="${common.dir}/common-build.xml"/> + <!-- override order for JBossXB to bootstrap properly --> <path id="junit.classpath"> <fileset dir="${lib.dir}"> Modified: search/trunk/common-build.xml =================================================================== --- search/trunk/common-build.xml 2008-10-27 14:00:13 UTC (rev 15402) +++ search/trunk/common-build.xml 2008-10-27 14:35:50 UTC (rev 15403) @@ -35,6 +35,7 @@ <property name="dist.src.dir" location="${dist.dir}/src"/> <property name="dist.test.dir" location="${dist.dir}/test"/> <property name="dist.lib.dir" location="${dist.dir}/lib"/> + <property name="dist.filter.dir" location="${dist.dir}/filters"/> <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"/> @@ -219,6 +220,10 @@ <copy todir="${dist.test.dir}"> <fileset dir="${test.dir}"/> </copy> + <mkdir dir="${dist.filter.dir}"/> + <copy todir="${dist.filter.dir}"> + <fileset dir="${filter.dir}"/> + </copy> </target> <target name="copysource" depends="copytest" @@ -298,15 +303,13 @@ </target> <target name="extras" description="Copies miscellaneous files to root dir"> - <copy todir="${dist.dir}/bin" failonerror="false"> - <fileset dir="bin"> - <include name="*.bat"/> - </fileset> - </copy> <copy file="readme.txt" todir="${dist.dir}"/> <copy file="lgpl.txt" todir="${dist.dir}"/> <copy file="changelog.txt" todir="${dist.dir}"/> <copy file="build.xml" todir="${dist.dir}"/> + <copy todir="${dist.dir}/jdbc"> + <fileset dir="jdbc"/> + </copy> <replace file="${dist.dir}/build.xml"> <replacetoken><![CDATA[../${name}-${version}]]> </replacetoken> @@ -392,7 +395,7 @@ </for> </target> - <target name="junitreport" depends=""> + <target name="junitreport"> <junitreport todir="${testreports.dir}"> <fileset dir="${testreports.dir}"> <include name="TEST-*.xml"/>