mondrian (4.0.0~svn13109-1) 06_build_with_openjdk.diff

Description: build.xml: Allow build with OpenJDK.
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2009-12-13
Forwarded: not-needed

--- a/build.xml
+++ b/build.xml
@@ -1101,7 +1101,7 @@
   </target>
 
   <target name="binzip"
-      depends="version,checkIsNotJdk16,war,srczip,javadoc,xml_schema,retroweave,unzip-FoodMartCreateData,unzip-FoodMartAccessDB">
+      depends="version,war,srczip,javadoc,xml_schema,retroweave,unzip-FoodMartCreateData,unzip-FoodMartAccessDB">
     <mkdir dir="${dist.dir}" />
     <delete file="${dist.bin.file}"/>
     <zip zipfile="${dist.bin.file}">
@@ -1200,16 +1200,8 @@
     </tar>
   </target>
 
-  <target name="checkIsNotJdk16" if="jdk16.present">
-    <fail message="The 'jar' target (and dependent targets 'release', 'binzip')
-must be run under JDK 1.5." />
-  </target>
-
   <target name="compileJdk16">
-    <exec osfamily="unix" executable="${unix.script}"/>
-    <exec osfamily="windows" dir="." executable="cmd">
-      <arg line="/c .\buildJdk16.bat"/>
-    </exec>
+	<antcall target="compile.java" />
   </target>
 
   <target name="jar" depends="version,compile,compile.tests,compileJdk16">