Changeset 20233 for greenstone3/trunk/gs3-setup.sh

Timestamp:

2009-08-12T13:25:22+12:00 (15 years ago)

Author:

oranfry

Message:

• build.xml: fail if user tries to combine tomcat6 and java1.4
• gs3-setup.sh: if search4j not present, warn they may need java 1.5

File:

• greenstone3/trunk/gs3-setup.sh (modified) (2 diffs)

greenstone3/trunk/gs3-setup.sh

@@ -90 +90 @@
  
   #CLASSPATH
+  addtopath CLASSPATH "."
   addtopath CLASSPATH "$GSDL3HOME/WEB-INF/classes"
   addtopath CLASSPATH "$GSDL3SRCHOME/resources/java"
@@ -164 +165 @@
   elif [ "$JAVA_HOME" != "" ] && [ "`which java`" == "$JAVA_HOME/bin/java" ]; then
     echo "  - Using java at $JAVA_HOME"
+    echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+    echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+    echo "             (SVN users may still use java 1.4)"
   elif [ "$JRE_HOME" != "" ] && [ "`which java`" == "$JRE_HOME/bin/java" ]; then
     echo "  - Using java at $JRE_HOME"
+    echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+    echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+    echo "             (SVN users may still use java 1.4)"
+
   #failing all that, print a warning
   else