[hibernate-commits] Hibernate SVN: r11157 - branches/HAN_SPLIT/HibernateExt/validator.

Author: epbernard Date: 2007-02-06 16:30:14 -0500 (Tue, 06 Feb 2007) New Revision: 11157 Modified: branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist branches/HAN_SPLIT/HibernateExt/validator/build.xml Log: Prepare the dist script Modified: branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist =================================================================== --- branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist 2007-02-06 05:52:13 UTC (rev 11156) +++ branches/HAN_SPLIT/HibernateExt/validator/build.properties.dist 2007-02-06 21:30:14 UTC (rev 11157) @@ -1,4 +1,11 @@ common.dir=. src.dir=src test.dir=test -hibernate-core.home=../hibernate-3.2 \ No newline at end of file +hibernate-core.home=../hibernate-3.2 + +#locally present jars +jpa-api.jar=./lib/ejb3-persistence.jar +jpa.jar=./lib/test/hibernate-entitymanager.jar +archive-browsing.jar=./lib/test/hibernate-entitymanager.jar +commons-annotations.jar=./lib/hibernate-commons-annotations.jar +annotations.jar=./lib/test/hibernate-annotations.jar \ No newline at end of file Modified: branches/HAN_SPLIT/HibernateExt/validator/build.xml =================================================================== --- branches/HAN_SPLIT/HibernateExt/validator/build.xml 2007-02-06 05:52:13 UTC (rev 11156) +++ branches/HAN_SPLIT/HibernateExt/validator/build.xml 2007-02-06 21:30:14 UTC (rev 11157) @@ -27,16 +27,25 @@ <property name="version" value="3.2.2.GA"/> <property name="javadoc.packagenames" value="org.hibernate.validator.*"/> <property name="copy.test" value="true"/> + <property name="javac.source" value="1.5"/> + <property name="javac.target" value="1.5"/> <property name="jdbc.dir" value="jdbc"/> <property name="common.dir" value="${basedir}/../common"/> - <property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/> + + <!-- dependencies --> + <property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/> <property name="annotations.jar" value="${basedir}/../metadata/target/hibernate-annotations/hibernate-annotations.jar"/> - <property name="commons-annotations.jar" + <property name="jpa.jar" + value="${basedir}/../ejb/target/hibernate-entitymanager/hibernate-entitymanager.jar"/> + <property name="archive-browsing.jar" + value="${basedir}/../ejb/lib/jboss-archive-browsing.jar"/> + <property name="commons-annotations.jar" value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/> - <import file="${common.dir}/common-build.xml"/> + <import file="${common.dir}/common-build.xml"/> + <path id="lib.moduleclass.path"> <pathelement location="${jpa-api.jar}"/> <pathelement location="${commons-annotations.jar}"/> @@ -45,11 +54,17 @@ <pathelement location="${src.dir}"/> <pathelement location="${test.dir}"/> <pathelement location="${annotations.jar}"/> - <fileset dir="${jdbc.dir}"> + <pathelement location="${jpa.jar}"/> + <pathelement location="${archive-browsing.jar}"/> + <fileset dir="${jdbc.dir}"> <include name="*.jar"/> <include name="*.zip"/> </fileset> - </path> + <fileset dir="${lib.dir}/test"> + <include name="*.jar"/> + <include name="*.zip"/> + </fileset> + </path> <target name="init"> <antcall target="common-build.init"/> @@ -57,7 +72,9 @@ <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/> <available file="${annotations.jar}" type="file" property="annotations.jar.available"/> - </target> + <available file="${jpa.jar}" type="file" property="jpa.jar.available"/> + <mkdir dir="${lib.dir}/test"/> + </target> <target name="get.jpa-api" depends="init" unless="jpa-api.jar.available"> <ant inheritall="false" dir="${basedir}/../ejb-api" target="clean"/> @@ -74,7 +91,12 @@ <ant inheritall="false" dir="${basedir}/../metadata" target="jar"/> </target> - <target name="compile" depends="init,get.jpa-api,get.commons-annotations" description="Compile the Java source code"> + <target name="get.jpa" depends="init" unless="jpa.jar.available"> + <ant inheritall="false" dir="${basedir}/../ejb" target="clean"/> + <ant inheritall="false" dir="${basedir}/../ejb" target="jar"/> + </target> + + <target name="compile" depends="init,get.jpa-api,get.commons-annotations" description="Compile the Java source code"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler" @@ -87,7 +109,8 @@ debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on" - source="1.5"> + source="${javac.source}" + target="${javac.target}"> <src path="${src.dir}"/> </javac> <copy todir="${classes.dir}"> @@ -98,7 +121,7 @@ </copy> </target> - <target name="compiletest" depends="init,get.annotations,compile" description="Compile the tests"> + <target name="compiletest" depends="init,get.annotations,get.jpa,compile" description="Compile the tests"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler" @@ -183,22 +206,8 @@ <antcall target="common-build.jar"/> </target> - <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> - <echo>Skipping java doc since ant's javadoc task cannot handle an alternative javadoc</echo> - </target --> - - <target name="jpa-javadoc" if="jpa-present"> - <mkdir dir="${jpa-javadoc.dir}"/> - <ant dir="../ejb-api" target="javadoc" inheritAll="false"/> - <copy todir="${jpa-javadoc.dir}"> - <fileset dir="${basedir}/../ejb-api/build/api"> - <include name="**/*.*"/> - </fileset> - </copy> - </target> - <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" + <target name="dist" depends="jar,javadoc,copysource,copytest,copylib,extras" description="Build everything"> <ant inheritall="false" dir="${basedir}/doc/reference"/> @@ -213,7 +222,20 @@ <include name="common-build.xml"/> </fileset> </copy> - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> + + <!-- copy dependencies --> + <copy todir="${dist.lib.dir}" failonerror="false"> + <fileset file="${jpa-api.jar}"/> + <fileset file="${commons-annotations.jar}"/> + </copy> + <mkdir dir="${dist.lib.dir}/test"/> + <copy todir="${dist.lib.dir}/test" failonerror="false"> + <fileset file="${annotations.jar}"/> + <fileset file="${jpa.jar}"/> + <fileset file="${archive-browsing.jar}"/> + </copy> + + <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> </copy> <antcall target="common-build.dist"/> </target>