Browse Source

Java version check (#9299)

tags/7.0.0.beta1
Artur Signell 11 years ago
parent
commit
7b25d8b203
2 changed files with 10 additions and 2 deletions
  1. 1
    1
      build.properties
  2. 9
    1
      build.xml

+ 1
- 1
build.properties View File

@@ -2,7 +2,7 @@ javadoc.doctitle=<h1>Vaadin</h1>
javadoc.bottom=<i>Copyright &#169; 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



+ 9
- 1
build.xml View File

@@ -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>

Loading…
Cancel
Save