[jboss-cvs] JBossAS SVN: r114625 - in branches/JBPAPP_5: testsuite and 1 other directories.

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

Author: ehugonnet
Date: 2013-12-20 06:12:35 -0500 (Fri, 20 Dec 2013)
New Revision: 114625

Modified:
   branches/JBPAPP_5/build/build.xml
   branches/JBPAPP_5/testsuite/build.xml
   branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
Log:
JBPAPP-10720: Merge build/build.properties and tools/etc/buildmagic/version-info.xml
version-info.xml is using build.properties.
The builds make a reference to the dir in which the build.properties is.


Modified: branches/JBPAPP_5/build/build.xml
===================================================================
--- branches/JBPAPP_5/build/build.xml	2013-12-20 10:53:33 UTC (rev 114624)
+++ branches/JBPAPP_5/build/build.xml	2013-12-20 11:12:35 UTC (rev 114625)
@@ -19,7 +19,7 @@
   <!-- ================================================================== -->
   <!-- Setup                                                              -->
   <!-- ================================================================== -->
-
+  <property name="configuration.directory" value= "." />
   <!--
      | Include the common Buildmagic elements.
      |

Modified: branches/JBPAPP_5/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5/testsuite/build.xml	2013-12-20 10:53:33 UTC (rev 114624)
+++ branches/JBPAPP_5/testsuite/build.xml	2013-12-20 11:12:35 UTC (rev 114625)
@@ -15,6 +15,8 @@
 
 <project default="main" name="JBoss/Testsuite"
          xmlns:server="http://jboss.org/ns/test/ant/server">
+
+   <property name="configuration.directory" value="../build" />
    <import file="../tools/etc/buildmagic/build-common.xml"/>
 
    <!-- Tests requiring separate server configurations -->

Modified: branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml	2013-12-20 10:53:33 UTC (rev 114624)
+++ branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml	2013-12-20 11:12:35 UTC (rev 114625)
@@ -5,6 +5,7 @@
   <!-- Include user and project property overrides. -->
   <property file="${user.home}/.buildmagic.properties"/>
   <property file="${user.home}/.ant.properties"/>
+  <property file="${configuration.directory}/build.properties"/>
 
   <!-- Setup the build timestamp & build identifer properties -->
   <tstamp>
@@ -14,11 +15,6 @@
   <property name="build.id" value="${build.number}"/>
 
     <!-- Version identifiers for the server. -->
-    <property name="version.major" value="5"/>
-    <property name="version.minor" value="3"/>
-    <property name="version.revision" value="0"/>
-    <property name="version.tag" value="Branch"/>
-    <property name="version.name" value="EAP"/>
     <!-- This must be set to the CVS tag for any release -->
     <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>