Author: thomas.diesler(a)jboss.com Date: 2008-04-24 13:48:43 -0400 (Thu, 24 Apr 2008) New Revision: 6672 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/ant.properties stack/cxf/trunk/src/main/distro/build.xml Log: Fix bin-dist Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-24 17:25:04 UTC (rev 6671) +++ stack/cxf/trunk/build.xml 2008-04-24 17:48:43 UTC (rev 6672) @@ -66,8 +66,17 @@ <!-- Distribution --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="prepare" description="Build the binary distribution"> + <target name="prepare-deploy" depends="prepare"> + <delete dir="${deploy.artifacts.dir}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> + </target> + + <target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution"> + <echo message="*************************************"/> <echo message="* mvn -P bindist assembly:directory *"/> <echo message="*************************************"/> @@ -83,16 +92,6 @@ <!-- Miscellaneous --> <!-- ================================================================== --> - <target name="prepare-deploy" depends="init"> - - <delete dir="${deploy.artifacts.dir}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-P${jbossws.integration.target}"/> - <arg value="package"/> - <arg value="assembly:directory"/> - </exec> - </target> - <target name="clean" depends="prepare" description="Cleans up most generated files."> <echo message="*************************************"/> Modified: stack/cxf/trunk/src/main/distro/ant.properties =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties 2008-04-24 17:25:04 UTC (rev 6671) +++ stack/cxf/trunk/src/main/distro/ant.properties 2008-04-24 17:48:43 UTC (rev 6672) @@ -10,7 +10,7 @@ jboss501.home=(a)jboss501.home@ # The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=(a)jbossws.integration.target@ +jbossws.integration.target=jboss422 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-04-24 17:25:04 UTC (rev 6671) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-04-24 17:48:43 UTC (rev 6672) @@ -11,13 +11,8 @@ <!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> -<project default="main" basedir="." name="JBossWS-CXF"> +<project basedir="." name="JBossWS-CXF"> - <!-- Load ant.properties --> - <available property="ant.properties.available" file="${basedir}/ant.properties"/> - <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${basedir}/ant.properties"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -43,8 +38,30 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="tests-init" depends="prepare,tests-classpath"> + <target name="init" depends="prepare"> + + <echo message="jbossid=${jbossws.integration.target}"/> + <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> + + <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/> + </target> + + <target name="tests-init" depends="init,tests-classpath"> + <path id="ws.stack.classpath"> <fileset dir="${thirdparty.dir}"/> </path> @@ -79,7 +96,7 @@ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> <!-- dummy targets --> - <target name="prepare-deploy" depends="prepare"/> + <target name="prepare-deploy" depends="init"/> <!-- ================================================================== --> <!-- Miscellaneous --> @@ -89,11 +106,4 @@ <delete dir="${tests.output.dir}"/> </target> - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - </project> \ No newline at end of file