You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ofbiz.apache.org by do...@apache.org on 2011/06/26 04:49:42 UTC

svn commit: r1139689 - /ofbiz/trunk/macros.xml

Author: doogie
Date: Sun Jun 26 02:49:41 2011
New Revision: 1139689

URL: http://svn.apache.org/viewvc?rev=1139689&view=rev
Log:
FIX: Add a check for java being at least 1.6.

Modified:
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1139689&r1=1139688&r2=1139689&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Sun Jun 26 02:49:41 2011
@@ -23,6 +23,13 @@ under the License.
  </condition>
  <fail unless="antatleast171" message="Please upgrade ant to at least 1.7.1"/>
 
+ <condition property="javaatleast16">
+  <not>
+   <matches pattern="^1\.[0-5]($|\..*)" string="${ant.java.version}"/>
+  </not>
+ </condition>
+ <fail unless="javaatleast16" message="Please upgrade java to at least 1.6"/>
+
  <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/>
  <macrodef name="iterate">
   <attribute name="filelist" default="subdirs"/>