Author: thomas.diesler(a)jboss.com Date: 2008-04-24 12:07:24 -0400 (Thu, 24 Apr 2008) New Revision: 6669 Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/build-setup.xml Log: fix dependency on jbossid Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-24 15:40:38 UTC (rev 6668) +++ stack/cxf/trunk/build.xml 2008-04-24 16:07:24 UTC (rev 6669) @@ -39,8 +39,27 @@ <target name="init" depends="prepare"> <xmlproperty file="${stack.dir}/pom.xml"/> - <property name="version.id" value="${project.version}"/> + <property name="version.id" value="${project.version}"/> + <echo message="version.id=${version.id}"/> + <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> <!-- ================================================================== --> @@ -49,13 +68,13 @@ <target name="build-bin-dist" depends="prepare" description="Build the binary distribution"> - <echo message="**********************************************"/> - <echo message="* mvn -P bindist,${jbossws.integration.target} assembly:directory *"/> - <echo message="**********************************************"/> + <echo message="*************************************"/> + <echo message="* mvn -P bindist assembly:directory *"/> + <echo message="*************************************"/> <delete dir="${stack.output.dir}/jbossws-cxf-dist"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-P bindist,${jbossws.integration.target}"/> + <arg value="-P bindist"/> <arg value="assembly:directory"/> </exec> </target> @@ -64,7 +83,7 @@ <!-- Miscellaneous --> <!-- ================================================================== --> - <target name="prepare-deploy" depends="prepare"> + <target name="prepare-deploy" depends="init"> <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> @@ -74,7 +93,7 @@ </exec> </target> - <target name="clean" description="Cleans up most generated files."> + <target name="clean" depends="prepare" description="Cleans up most generated files."> <echo message="*************************************"/> <echo message="* mvn clean *"/> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-24 15:40:38 UTC (rev 6668) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-24 16:07:24 UTC (rev 6669) @@ -63,24 +63,6 @@ <!-- ================================================================== --> <target name="prepare"> - - <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}"/> - <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp>