From 41885cc1d4c37fc786d6c5548747954a4001dc6f Mon Sep 17 00:00:00 2001
From: Julian Hyde <julianhyde@gmail.com>
Date: Wed, 29 Feb 2012 06:45:38 +0000
Subject: [PATCH] Allow the target target, 'all', to run under any JDK. The
 'dist' target, used to create an official release, requires JDK 1.5. We
 assume that anyone creating a release is following RELEASE_CHECKLIST.txt
 closely.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@518 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 build.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index af0b394..1b4d6f2 100644
--- a/build.xml
+++ b/build.xml
@@ -48,7 +48,7 @@ src/org/olap4j/mdx/parser/impl/TokenMgrError.java,
 src/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java" />
 
     <target name="checkIsJdk15" if="jdk15.not.present">
-        <fail message="The 'jar' target (and dependent targets 'release', 'binzip') must be run under JDK 1.5." />
+        <fail message="The 'dist' target (used to make an official release) must be run under JDK 1.5." />
     </target>
 
     <condition property="jdk15.present">
@@ -108,7 +108,9 @@ src/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java" />
     </target>
 
     <!-- Override to create a proper release. -->
-    <target name="dist"
+    <target name="dist" depends="checkIsJdk15, all"/>
+
+    <target name="all"
         depends="clean,version-properties,jar,tck-jar,xmla-jar,javadoc,javadoc-pdf,jar-jdk14,source.zip"
         description="Creates a distribution">
         <zip zipfile="${dist.dir}/${zip.filename}">
@@ -154,7 +156,7 @@ olap4j_api.pdf"
         depends="init, compile.pre, compileJdk15, compileJdk16, compileJdk17, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post"
         description="Performs all the steps to prepare the bin directory with a complete compilation" />
 
-    <target name="jar" depends="init, compile.pre, checkIsJdk15, compileJdk15, compileJdk16, compileJdk17, compile, compile-tests, set-build.id, generate.manifest"
+    <target name="jar" depends="init, compile.pre, compileJdk15, compileJdk16, compileJdk17, compile, compile-tests, set-build.id, generate.manifest"
         description="Jars up the bin directory after a compile">
         <zip destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar">
             <zipfileset dir="${basedir}" prefix=""