Changeset 15444 for other-projects

Timestamp:

2008-05-14T14:47:03+12:00 (16 years ago)

Author:

ak19

Message:

Added an ensure-check-java-version target so that CheckJavaVersion.java is only downloaded during builds when it or its class file are missing

File:

• other-projects/trunk/gs3-webservices-democlient/build.xml (modified) (2 diffs)

other-projects/trunk/gs3-webservices-democlient/build.xml

@@ -69 +69 @@
 
 <!-- Main targets: to build the GS3 web services demo-client and to create the tar.gz file for downloading -->
-<target name="build-demo-client" description="Creates the jar distribution file" depends="compile-demo-client,update-check-java-version">
+<target name="build-demo-client" description="Creates the jar distribution file" depends="compile-demo-client,ensure-check-java-version">
   <mkdir dir="${basedir}/logs" /> <!-- Need a logs dir for outputting log4j stuff-->
   <delete file="${exec.jar.name}" /> <!--For now: Let's delete it first and do a fresh rebuild-->
@@ -139 +139 @@
 </target>
 
+<target name="ensure-check-java-version" description="Ensures the CheckJavaVersion.java file required to run the demo-client's launching scripts (sh or bat) is present">
+    <condition property="check.java.version.exists">
+    <and>
+    <available file="${basedir}/CheckJavaVersion.class"/>
+    <available file="${basedir}/CheckJavaVersion.java"/>
+    </and>
+    </condition>
+    <antcall target="update-check-java-version" />
+</target>
+
 <!-- Gets the file if the local copy is missing or out of date (since usetimestamp=true) -->
-<target name="update-check-java-version" description="Gets the latest version of CheckJavaVersion.javafrom Greenstone's SVN repository">
+<target name="update-check-java-version" description="Gets the latest version of CheckJavaVersion.java from Greenstone's SVN repository" unless="check.java.version.exists">
   <get src="${check.java.version.svn.file}" 
     dest="${basedir}/CheckJavaVersion.java"