[jboss-svn-commits] JBL Code SVN: r25688 - labs/jbosstm/trunk.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2009-03-17 08:28:17 -0400 (Tue, 17 Mar 2009)
New Revision: 25688

Modified:
   labs/jbosstm/trunk/build-release-pkgs.xml
   labs/jbosstm/trunk/build.xml
Log:
Added source tag property handling. JBTM-515


Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml	2009-03-17 12:19:08 UTC (rev 25687)
+++ labs/jbosstm/trunk/build-release-pkgs.xml	2009-03-17 12:28:17 UTC (rev 25688)
@@ -66,15 +66,14 @@
     <property name="mvn.url" value="dav:https://snapshots.jboss.org/maven2"/>
 -->
 
-
     <!-- a working direrctory for the process. Can contain output from previous releases if you like to keep them archived locally. -->
     <property name="workdir" location="/tmp/packaged_builds"/>
     <!-- where to get the source -->
     <property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm/tags"/>
     <!-- The tag as it appears under svnbase -->
-    <property name="tag" value="JBOSSTS_4_6_0_CR1"/>
+    <property name="tag" value="JBOSSTS_4_6_0_GA"/>
     <!-- The file name base for the user downloadable files. Derive it from the tag -->
-    <property name="filename" value="4.6.0.CR1"/>
+    <property name="filename" value="4.6.0.GA"/>
     <!-- the location the JBossTS web site content svn is checked out to -->
     <property name="cmsdir" value="/home/jhalli/IdeaProjects/jboss/jbosstm-cms/"/>
     <!-- the location the maven repository svn is checked out to.
@@ -114,7 +113,9 @@
         <delete dir="${workdir}/build"/>
         <mkdir dir="${workdir}/build"/>
         <unzip src="${workdir}/jbossts-jta-${filename}-src.zip" dest="${workdir}/build"/>
-        <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjta"/>
+        <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjta">
+            <property name="com.hp.mw.source" value="${tag}"/>
+        </ant>
 
         <!-- package the JTA only binary release -->
         <copy todir="${workdir}/build/${tag}/${tag}">
@@ -128,7 +129,9 @@
         <delete dir="${workdir}/build"/>
         <mkdir dir="${workdir}/build"/>
         <unzip src="${workdir}/jbossts-full-${filename}-src.zip" dest="${workdir}/build"/>
-        <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjts"/>
+        <ant dir="${workdir}/build/${tag}" antfile="build.xml" target="jbossjts">
+            <property name="com.hp.mw.source" value="${tag}"/>
+        </ant>
         <ant dir="${workdir}/build/${tag}/XTS" antfile="build.xml" target="install">
             <!-- build the jbossxts.sar with 1.1 only, not 1.0 (which is unsupported) -->
             <property  name="sartype" value="sar-11"/>

Modified: labs/jbosstm/trunk/build.xml
===================================================================
--- labs/jbosstm/trunk/build.xml	2009-03-17 12:19:08 UTC (rev 25687)
+++ labs/jbosstm/trunk/build.xml	2009-03-17 12:28:17 UTC (rev 25688)
@@ -42,6 +42,8 @@
 
    <available property="jts.present" file="${jts.dir}" type="dir"/>
 
+   <property name="com.hp.mw.sourceid" value="unknown"/>
+    
    <property name="junit.jar" location="ext/junit.jar"/>
    <macrodef name="runant">
       <attribute name="target"/>
@@ -51,6 +53,7 @@
             fork="true" failonerror="true">
             <sysproperty key="ant.home" value="${ant.home}"/>
             <sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
+            <sysproperty  key="com.hp.mw.sourceid" value="${com.hp.mw.sourceid}"/>
             <arg value="-cp"/>
             <arg value="${junit.jar}"/>
             <arg value="-f"/>
@@ -240,7 +243,6 @@
         JTA or JTS. The actual content of the config file is not affected. -->
       <property name="com.hp.mw.ts.product.propertyfile" value="jbossts-properties.xml"/>
 
-      <property name="com.hp.mw.sourceid" value="unknown"/>
       <property name="com.hp.mw.version" value="unknown"/>
 
       <property name="com.hp.mw.builder" value="JBoss Inc. [${user.name}] (${os.name} ${os.version})"/>