From: Marko Grönroos <magi@iki.fi>
Date: Fri, 20 Feb 2009 12:38:56 +0000 (+0000)
Subject: Added ignoreversion property to allow ignoring version check when building. Fixes... 
X-Git-Tag: 6.7.0.beta1~3097
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=55555288fff5baf8d0d940b4177098bc0739a4fc;p=vaadin-framework.git

Added ignoreversion property to allow ignoring version check when building. Fixes #2656.

svn changeset:6924/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
index 4311815756..b7e75dfb24 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -117,9 +117,12 @@
     <!-- Java compiler version. -->
     <target name="check-java-version">
       <condition property="java.version.matches">
-        <equals arg1="${ant.java.version}" arg2="1.5"/>
+        <or>
+          <equals arg1="${ant.java.version}" arg2="1.5"/>
+          <isset property="ignoreversion"/>
+        </or>
       </condition>
-      <fail unless="java.version.matches" message="IT Mill Toolkit must be compiled with genuine Java 1.5 compiler. You are trying to compile with version ${ant.java.version}."/>
+      <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but IT Mill Toolkit must be compiled with genuine Java 1.5 compiler. Use -Dignoreversion=1 for ant to ignore the version check."/>
       <echo>Java version is ${ant.java.version} as required.</echo>
     </target>