Changeset 32153 for main/trunk/greenstone3

Timestamp:

2018-02-26T19:57:21+13:00 (6 years ago)

Author:

ak19

Message:

2 Bugfixes and tidying up errorhandling in JarTools. 1. Dr Bainbridge fixed issue surrounding env.Path rather than env.PATH being used on Windows, while the empty env.PATH was being concatenated as a variable name by build.xml. This resulted in a cyclical reference, noticed when running the GLI Web Start Application (converted from GLI Applet). Fix is in build.xml. 2. My bugfix to WebGatherer.java, the new GLI Web Start Application. The collectionDir wasn't set correctly until the Gatherer object was instantiated, but the collect dir needed to be known by other code beforehand. So shifted the Gatherer object instantiation up a bit. 3. Can't yet reproduce the Exception seen twice before when running GLI Web Start application. The exception was thrown in ZipTools.java. Tested by rerunning the applet repeatedly, but it hasn't struck again yet. Perhaps it's been fixed now because of the other changes?

File:

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

main/trunk/greenstone3/build.xml

@@ -649 +649 @@
   </path>
 
-
-  <path id="local.tomcat.path">
-    <pathelement location="${basedir}/bin/script"/>
-    <pathelement location="${basedir}/bin"/>
-    <pathelement location="${lib.jni}"/>
-    <pathelement path="${env.PATH}"/>
-    <pathelement path="${env.Path}"/>
-    <pathelement path="${wn.home}/bin"/>
-  </path>
+  
+    <if><bool><isset property="env.PATH"/></bool>
+      <path id="local.tomcat.path">
+        <pathelement location="${basedir}/bin/script"/>
+        <pathelement location="${basedir}/bin"/>
+        <pathelement location="${lib.jni}"/>    
+        <pathelement path="${env.PATH}"/>
+        <pathelement path="${wn.home}/bin"/>
+      </path>
+      <!-- Windows can be case sensitive about env.PATH, preferring env.Path. See https://ant.apache.org/manual/Tasks/property.html  -->
+      <else><if><bool><isset property="env.Path"/></bool>
+        <path id="local.tomcat.path">
+          <pathelement location="${basedir}/bin/script"/>
+          <pathelement location="${basedir}/bin"/>
+          <pathelement location="${lib.jni}"/>
+          <pathelement path="${env.Path}"/>
+          <pathelement path="${wn.home}/bin"/>
+        </path>
+      <!-- else print error about no path set -->
+      <else>
+        <echo>No env.PATH (or env.Path) set. Unable to set local.tomcat.path property</echo>
+      </else></if></else>   
+    </if>   
 
   <target name="test-setup">
@@ -666 +680 @@
     <echo>is windows : ${current.os.iswindows}</echo>
     <echo>os.unix: ${os.unix}</echo>
+    <echo>env.PATH: ${env.PATH}</echo>
+    <echo>env.Path: ${env.Path}</echo>  
   </target>