[jboss-cvs] JBossAS SVN: r111306 - branches/JBPAPP_5_1/build.

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

Author: rrajesh
Date: 2011-05-06 18:06:00 -0400 (Fri, 06 May 2011)
New Revision: 111306

Modified:
   branches/JBPAPP_5_1/build/build.xml
Log:
JBPAPP-6348 Conditionally set module.version

Modified: branches/JBPAPP_5_1/build/build.xml
===================================================================
--- branches/JBPAPP_5_1/build/build.xml	2011-05-06 21:35:19 UTC (rev 111305)
+++ branches/JBPAPP_5_1/build/build.xml	2011-05-06 22:06:00 UTC (rev 111306)
@@ -82,14 +82,17 @@
     <!-- Module name(s) & version -->
     <property name="module.name" value="jboss"/>
     <property name="module.Name" value="JBoss Build"/>
-    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}">
-       <isset property="release.version.tag"/>
+    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}">
+        <not> 
+        <and>
+        <length string="${version.tag}" trim="true" when="greater" length="0"/>
+        </and>
+        </not>
     </condition>
     <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}">
-<!--    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}"> -->
-       <not>
-          <isset property="release.version.tag"/>
-       </not>
+        <and>
+        <length string="${version.tag}" trim="true" when="greater" length="0"/>
+        </and>
     </condition>
 
     <!-- Choose between EAP and EWP build -->