Author: hardy.ferentschik Date: 2008-06-05 05:10:41 -0400 (Thu, 05 Jun 2008) New Revision: 14740 Modified: annotations/trunk/build.xml annotations/trunk/common-build.xml Log: Build file cleanup: - removed the part which was using the removed lib.dir Modified: annotations/trunk/build.xml =================================================================== --- annotations/trunk/build.xml 2008-06-05 08:44:13 UTC (rev 14739) +++ annotations/trunk/build.xml 2008-06-05 09:10:41 UTC (rev 14740) @@ -64,7 +64,6 @@ </tstamp> <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/ --> - <mkdir dir="${lib.dir}/test"/> <mkdir dir="${ivy.dep.dir}/core"/> <mkdir dir="${ivy.dep.dir}/test"/> <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> @@ -169,7 +168,7 @@ </target> <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" + <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,extras" description="Build everything"> <ant inheritall="false" dir="${basedir}/doc/reference"/> @@ -202,15 +201,7 @@ <include name="*.jar"/> </fileset> </copy> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset file="${lib.dir}/test/*.jar"/> - </copy> - <mkdir dir="${dist.lib.dir}/build"/> - <copy todir="${dist.lib.dir}/build" failonerror="false"> - <fileset file="${lib.dir}/build/*.jar"/> - </copy> - <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation --> <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar" failonerror="false"/> Modified: annotations/trunk/common-build.xml =================================================================== --- annotations/trunk/common-build.xml 2008-06-05 08:44:13 UTC (rev 14739) +++ annotations/trunk/common-build.xml 2008-06-05 09:10:41 UTC (rev 14740) @@ -13,7 +13,6 @@ <property name="src.dir" location="src/java"/> <property name="test.dir" location="src/test"/> - <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"/> @@ -44,9 +43,6 @@ <property name="pom.file" value="pom.xml"/> <property name="src.jar" value="${build.dir}/src.jar"/> - <!-- build related properties --> - <property name="build.lib.dir" value="${lib.dir}/build"/> - <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> </taskdef> @@ -71,9 +67,6 @@ <artifact:remoteRepository id="offline.repository.jboss.org" url="file://${offline.repository.jboss.org}" /> <path id="lib.class.path"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> <path refid="lib.moduleclass.path"/> <pathelement path="${clover.jar}"/> </path> @@ -120,9 +113,6 @@ <taskdef resource="clovertasks"/> <path id="junit.classpath"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> <pathelement path="${classes.dir}"/> <pathelement path="${testclasses.dir}"/> <path refid="lib.class.path"/> @@ -268,18 +258,6 @@ </copy> </target> - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> <mkdir dir="${dist.doc.dir}"/> <copy todir="${dist.doc.dir}"> @@ -340,7 +318,7 @@ </replace> </target> - <target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything"> + <target name="dist" depends="jar,javadoc,copysource,copydoc,extras" description="Build everything"> <zip zipfile = "${dist.dir}-${version}.zip"> <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> </zip>