Changeset 32785 for main

Show
Ignore:
Timestamp:
19.02.2019 15:16:33 (10 months 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32702 r32785  
    9696  <condition property="current.os.iswindows"> 
    9797    <os family="windows"/> 
     98  </condition> 
     99 
     100  <!-- Java executable: if packages/jre/bin exists as it does for GS3 binaries, use that. 
     101       JRE not included in svn/devel GS3, for which we attempt to use any installed java 
     102       as before. --> 
     103  <condition property="javaexec" value="packages/jre/bin/java" else="java"> 
     104    <available file="packages/jre/bin/java"/> 
    98105  </condition> 
    99106 
     
    11071114      <property name="derby.server.classpath.prop" refid="derby.server.classpath" /> 
    11081115       
    1109       <exec executable="java" spawn="true"><!-- failonerror="true"--> 
     1116      <exec executable="${javaexec}" spawn="true"><!-- failonerror="true"--> 
    11101117    <env key="CLASSPATH" path="${derby.server.classpath.prop}"/> 
    11111118    <arg value="org.apache.derby.drda.NetworkServerControl"/>