1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
|
Description: Support for new JDK >= 1.4 (read from ant.java.version property)
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2011-06-02
Forwarded: no
--- a/_shared/common-ant/common-ant-tasks-init.ant-inc.xml
+++ b/_shared/common-ant/common-ant-tasks-init.ant-inc.xml
@@ -60,6 +60,9 @@
<equals arg1="${ant.java.version}" arg2="1.2" />
<equals arg1="${ant.java.version}" arg2="1.3" />
<equals arg1="${ant.java.version}" arg2="1.4" />
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.7" />
</or>
</condition>
<condition property="_shared.common.depend.has-jdk12" >
@@ -67,17 +70,44 @@
<equals arg1="${ant.java.version}" arg2="1.2" />
<equals arg1="${ant.java.version}" arg2="1.3" />
<equals arg1="${ant.java.version}" arg2="1.4" />
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.7" />
</or>
</condition>
<condition property="_shared.common.depend.has-jdk13" >
<or>
<equals arg1="${ant.java.version}" arg2="1.3" />
<equals arg1="${ant.java.version}" arg2="1.4" />
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.7" />
</or>
</condition>
<condition property="_shared.common.depend.has-jdk14" >
<or>
<equals arg1="${ant.java.version}" arg2="1.4" />
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.7" />
+ </or>
+ </condition>
+ <condition property="_shared.common.depend.has-jdk15" >
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.7" />
+ </or>
+ </condition>
+ <condition property="_shared.common.depend.has-jdk16" >
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.7" />
+ </or>
+ </condition>
+ <condition property="_shared.common.depend.has-jdk17" >
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.7" />
</or>
</condition>
</target>
|