[jbossws-commits] JBossWS SVN: r5618 - in stack/metro/trunk: ant-import and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2008-02-07 15:05:00 -0500 (Thu, 07 Feb 2008) New Revision: 5618 Modified: stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/build.xml stack/metro/trunk/version.properties Log: Build implementation version from specification version and build Id (i.e. jbossws-3.0-metro.1.0.0.DEV) Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-07 19:24:03 UTC (rev 5617) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-07 20:05:00 UTC (rev 5618) @@ -18,8 +18,11 @@ <!-- ================================================================== --> <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - - <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/> + + <!-- FIXME: the framework version has to be included somehow. Maybe from jbossws-framework.jar ? --> + <property name="dist.name" value="${specification.version}-metro-${version.id}"/> + + <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-dist"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> @@ -148,8 +151,8 @@ </copy> <chmod file="${bindist.dir}/build.sh" perm="+x"/> - <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip"> - <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/> + <zip destfile="${sunri.output.dir}/${dist.name}.zip"> + <fileset dir="${sunri.output.dir}" includes="jbossws-metro-dist/**"/> </zip> </target> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-02-07 19:24:03 UTC (rev 5617) +++ stack/metro/trunk/build.xml 2008-02-07 20:05:00 UTC (rev 5618) @@ -86,7 +86,7 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-metro-${version.id}"/> + <filter token="implementation.version" value="${specification.version}-metro-${version.id}"/> <filtersfile file="${int.sunri.dir}/version.properties"/> </filterset> </copy> @@ -136,7 +136,7 @@ </fileset> <filterset> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-metro-${version.id}"/> + <filter token="implementation.version" value="${specification.version}-metro-${version.id}"/> <filtersfile file="${sunri.dir}/version.properties"/> </filterset> </copy> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-02-07 19:24:03 UTC (rev 5617) +++ stack/metro/trunk/version.properties 2008-02-07 20:05:00 UTC (rev 5618) @@ -5,7 +5,7 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-3.0 -version.id=2.1.0.DEV +version.id=1.0.0.DEV repository.id=snapshot implementation.title=JBoss Web Services - Sun Metro