Changeset 32792 for main/trunk/greenstone3/build.xml

Timestamp:

2019-02-21T16:43:10+13:00 (5 years ago)

Author:

ak19

Message:

Undoing recent commit of forcing the ant force-start-derby target of using the bundled JRE's java. This would only have been correct during the installer. During the installer, launching java directly fails on systems that don't have java installed.

File:

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

main/trunk/greenstone3/build.xml

@@ -9 +9 @@
 <project name="greenstone3" default="usage" basedir=".">
   <echo>os.name: ${os.name}</echo>
-
+  
   <!-- ============ classpath =================== -->
   <path id="project.classpath">
@@ -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>
 
@@ -1113 +1106 @@
   <target name="force-start-derby">
       <property name="derby.server.classpath.prop" refid="derby.server.classpath" />
-      
-      <exec executable="${javaexec}" spawn="true"><!-- failonerror="true"-->
+      <!-- During the installer, launching java directly fails on systems that don't have java installed.
+       Forcing force-start-derby to always use packages/jre/bin/java is wrong too: as gs3-setup does
+       a lot of work of determining the correct JRE_HOME/JAVA_HOME (not necessarily the GS3 bundled JRE)
+       and we want to be consistent in using the same java throughout. Solution:
+       Refer to the JRE used in executing this ant file, which for installers will always be the bundled one.
+       https://stackoverflow.com/questions/17571595/env-java-home-not-found-ant -->
+      <exec executable="${java.home}/bin/java" spawn="true"><!-- failonerror="true"-->
     <env key="CLASSPATH" path="${derby.server.classpath.prop}"/>
     <arg value="org.apache.derby.drda.NetworkServerControl"/>