[jboss-cvs] JBossAS SVN: r92757 - branches/JBPAPP_5_0/build.

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

Author: fnasser at redhat.com
Date: 2009-08-24 17:25:03 -0400 (Mon, 24 Aug 2009)
New Revision: 92757

Modified:
   branches/JBPAPP_5_0/build/build-release.xml
   branches/JBPAPP_5_0/build/build.xml
Log:
JBPAPP-2636 - Fix build scripts so they work properly with versions with no tag

Modified: branches/JBPAPP_5_0/build/build-release.xml
===================================================================
--- branches/JBPAPP_5_0/build/build-release.xml	2009-08-24 20:59:45 UTC (rev 92756)
+++ branches/JBPAPP_5_0/build/build-release.xml	2009-08-24 21:25:03 UTC (rev 92757)
@@ -137,7 +137,12 @@
                   <equals arg1="${release.version.major}" arg2="${version.major}"/>
                   <equals arg1="${release.version.minor}" arg2="${version.minor}"/>
                   <equals arg1="${release.version.revision}" arg2="${version.revision}"/>
-                  <equals arg1="${release.version.tag}" arg2="${version.tag}"/>
+                  <or>
+                     <equals arg1="${release.version.tag}" arg2="${version.tag}"/>
+                     <not>
+                        <isset property="release.version.tag"/>
+                     </not>
+                  </or>
                </and>
             </not>
          </condition>

Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml	2009-08-24 20:59:45 UTC (rev 92756)
+++ branches/JBPAPP_5_0/build/build.xml	2009-08-24 21:25:03 UTC (rev 92757)
@@ -82,7 +82,14 @@
     <!-- Module name(s) & version -->
     <property name="module.name" value="jboss"/>
     <property name="module.Name" value="JBoss Build"/>
-    <property name="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}">
+       <isset property="release.version.tag"/>
+    </condition>
+    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}">
+       <not>
+          <isset property="release.version.tag"/>
+       </not>
+    </condition>
 
     <!-- The combined library classpath -->
     <path id="library.classpath">