diff options
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | build.xml | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/build.properties b/build.properties index 7da02058ac..0a4f894b4b 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright © 2000-2011 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd -vaadin.java.version=6 +vaadin.java.version=1.6 vaadin.version=0.0.0.noversion @@ -14,7 +14,7 @@ </subant> </target> - <target name="buildorder"> + <target name="buildorder" depends="official.build.checks"> <!-- Find out a good build order --> <ivy:buildlist reference="build-path"> <fileset dir="." includes="**/build.xml"> @@ -38,4 +38,12 @@ </subant> </target> + <target name="official.build.checks" if="official.build"> + <condition property="java.version.matches"> + <equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" /> + </condition> + <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." /> + <echo>Java version is ${ant.java.version} as required.</echo> + </target> + </project> |