]> source.dussan.org Git - vaadin-framework.git/commitdiff
Added ignoreversion property to allow ignoring version check when building. Fixes...
authorMarko Grönroos <magi@iki.fi>
Fri, 20 Feb 2009 12:38:56 +0000 (12:38 +0000)
committerMarko Grönroos <magi@iki.fi>
Fri, 20 Feb 2009 12:38:56 +0000 (12:38 +0000)
svn changeset:6924/svn branch:trunk

build/build.xml

index 4311815756736c1cd083f226aeee441bd36fa083..b7e75dfb2409a41367ec4c0ecb0f25b940b106f7 100644 (file)
     <!-- 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>