[jboss-svn-commits] JBL Code SVN: r24242 - in labs/jbossbuild/buildmagic/trunk: tools/etc/buildmagic and 1 other directory.

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

Author: pgier
Date: 2008-12-04 18:44:52 -0500 (Thu, 04 Dec 2008)
New Revision: 24242

Modified:
   labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
   labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
Log:
[JBBUILD-432] Add code to allow ant 1.7

Modified: labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java	2008-12-04 23:36:58 UTC (rev 24241)
+++ labs/jbossbuild/buildmagic/trunk/tasks/src/main/org/jboss/tools/buildmagic/task/module/ExecuteModules.java	2008-12-04 23:44:52 UTC (rev 24242)
@@ -275,6 +275,22 @@
 
       Map props = getProject().getProperties();
       
+      // Workaround for ant 1.7 compatibility [JBBUILD-432]
+      if ( props.get("ant.version").toString().contains("1.7") )
+      {
+    	  Property antVersion = ant.createProperty();
+    	  antVersion.setName("ant.version");
+    	  antVersion.setValue(props.get("ant.version").toString());
+    	  antVersion.execute();
+    	  
+    	  Property antCoreLib = ant.createProperty();
+    	  antCoreLib.setName("ant.core.lib");
+    	  antCoreLib.setValue(props.get("ant.core.lib").toString());
+    	  antCoreLib.execute();
+      }
+      // End hack
+
+      
       // see if this is a valid ant file
       try {
          if (ant.getBuildFile() != null);

Modified: labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent	2008-12-04 23:36:58 UTC (rev 24241)
+++ labs/jbossbuild/buildmagic/trunk/tools/etc/buildmagic/buildmagic.ent	2008-12-04 23:44:52 UTC (rev 24242)
@@ -10,6 +10,7 @@
   <!-- Make sure we have the right version of Ant -->
   <property name="buildmagic.ant15.baseversion" value="1.5"/>
   <property name="buildmagic.ant16.baseversion" value="1.6"/>
+  <property name="buildmagic.ant17.baseversion" value="1.7"/>
 
   <!--
      | Add new conditions for other supported Ant versions when they
@@ -22,6 +23,8 @@
         substring="Ant version ${buildmagic.ant15.baseversion}"/>
       <contains string="${ant.version}"
         substring="Ant version ${buildmagic.ant16.baseversion}"/>
+      <contains string="${ant.version}"
+        substring="Ant version ${buildmagic.ant17.baseversion}"/>
     </or>
   </condition>
 
@@ -31,7 +34,7 @@
 
     ${ant.version}
 
-  Please install a version which is compatible with Ant ${buildmagic.ant.baseversion}.
+  Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion}, ${buildmagic.ant16.baseversion}, or ${buildmagic.ant17.baseversion}.
 
   </fail>