Author: sijskes
Date: Fri Dec  3 15:57:51 2010
New Revision: 1041890

URL: http://svn.apache.org/viewvc?rev=1041890&view=rev
Log: (empty)

Modified:
    incubator/river/jtsk/trunk/hudson.xml

Modified: incubator/river/jtsk/trunk/hudson.xml
URL: 
http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/hudson.xml?rev=1041890&r1=1041889&r2=1041890&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/hudson.xml (original)
+++ incubator/river/jtsk/trunk/hudson.xml Fri Dec  3 15:57:51 2010
@@ -18,13 +18,45 @@
  !-->
 <project name="hudson" basedir="." >
 
-    <target name="build-trunk-matrix" >
+    <target name="build-trunk-matrix" depends="init" >
         <ant>
-            <property name="river.source" value="1.4" />
-            <property name="river.target" value="1.4" />
             <target name="clean" />
             <target name="hudson-ci" />
         </ant>
     </target>
 
+    <target name="init" 
depends="determine-version,settings-jdk4,settings-jdk5,settings-jdk6" >
+        <echoproperties/>
+    </target>
+
+    <target name="determine-version" >
+        <condition property="build.on.jdk4">
+            <equals arg1="${ant.java.version}" arg2="1.4"/>
+        </condition>
+        <condition property="build.on.jdk5">
+            <equals arg1="${ant.java.version}" arg2="1.5"/>
+        </condition>
+        <condition property="build.on.jdk6">
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
+        </condition>
+    </target>
+
+    <target name="settings-jdk4" if="build.on.jdk4" >
+        <fail if="build.on.jdk5" />
+        <fail if="build.on.jdk6" />
+        <property name="river.source" value="1.4" />
+        <property name="river.target" value="1.4" />
+    </target>
+    <target name="settings-jdk5" if="build.on.jdk5" >
+        <fail if="build.on.jdk4" />
+        <fail if="build.on.jdk6" />
+        <property name="river.source" value="1.4" />
+        <property name="river.target" value="1.4" />
+    </target>
+    <target name="settings-jdk6" if="build.on.jdk6" >
+        <fail if="build.on.jdk4" />
+        <fail if="build.on.jdk5" />
+        <property name="river.source" value="1.4" />
+        <property name="river.target" value="1.4" />
+    </target>
 </project>


Reply via email to