Changeset 36760

Timestamp:

2022-10-09T17:23:40+13:00 (19 months ago)

Author:

davidb

Message:

To run the ant 'install' target to compile everything up without having sourced gs3-devel.sh (i.e., we rely on the newer where interall build.xml does this), then we need to pass on the env.JAVA_HOME property explicitly to exec commands that make use of it

File:

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

main/trunk/greenstone3/build.xml

@@ -3684 +3684 @@
     <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" failonerror="true">
       <arg value="JAVACOPTIONS=-encoding UTF8"/>
+      <env key="JAVA_HOME" path="${env.JAVA_HOME}"/>
     </exec>
     <exec executable="make" os="${os.unix}" dir="${javagdbm.home}" failonerror="true">
@@ -3695 +3696 @@
     <echo>Windows: compile javagdbm</echo>
     <exec executable="${javagdbm.home}/winMake.bat" osfamily="windows" dir="${javagdbm.home}" failonerror="true">     
+      <env key="JAVA_HOME"    path="${env.JAVA_HOME}"/>
       <env key="GSDL3SRCHOME" path="${basedir}"/>
     </exec>
@@ -3889 +3891 @@
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
       <arg value="${gs2.compile.target}"/>
+      <arg value="JAVA_HOME=${env.JAVA_HOME}"/>      
     </exec>
     <!-- windows: -->
@@ -3895 +3898 @@
       <arg value="win32.mak"/>
       <arg value="VISUAL_STUDIO_MAJORVERSION=${visualstudio.majorversion}"/>      
+      <arg value="JAVA_HOME=${env.JAVA_HOME}"/>      
+
       <arg value="GSDLHOME=${common.src.binhome}"/>
       <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/>