Changeset 32785 for main

Timestamp:

2019-02-19T15:16:33+13:00 (5 years ago)

Author:

ak19

Message:

Bugfix discovered when testing on new Ubuntu 18.04 VM which had no Java pre-installed. Installer failed because the tomcat target depends on ant force-start-derby which assumes java is installed and just launches java. However, for GS3 binaries, we have the JRE java so we can use that to run ant force-start-derby. Need to still make allowances for running this target in SVN/devel versions of GS3 which don't come bundled with a JRE, and for which we use the old way: assume java is installed and run java.

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -96 +96 @@
   <condition property="current.os.iswindows">
     <os family="windows"/>
+  </condition>
+
+  <!-- Java executable: if packages/jre/bin exists as it does for GS3 binaries, use that.
+       JRE not included in svn/devel GS3, for which we attempt to use any installed java
+       as before. -->
+  <condition property="javaexec" value="packages/jre/bin/java" else="java">
+    <available file="packages/jre/bin/java"/>
   </condition>
 
@@ -1107 +1114 @@
       <property name="derby.server.classpath.prop" refid="derby.server.classpath" />
       
-      <exec executable="java" spawn="true"><!-- failonerror="true"-->
+      <exec executable="${javaexec}" spawn="true"><!-- failonerror="true"-->
     <env key="CLASSPATH" path="${derby.server.classpath.prop}"/>
     <arg value="org.apache.derby.drda.NetworkServerControl"/>