Changeset 35713

Timestamp:

2021-10-28T11:51:49+13:00 (2 years ago)

Author:

davidb

Message:

Some work to bring the cygwin friendly '.sh' version up to date with the .bat version for JDK (note still need to do the same for Perl5)

Location:

local/greenstone3/windows-64bit

Files:

• PREPARE-JDK8.sh (added)
• gs3-setup.sh (modified) (1 diff)

local/greenstone3/windows-64bit/gs3-setup.sh

@@ -2 +2 @@
 # Useful when compiling with Cygwin on Windows
 
-export JAVA_HOME=/cygdrive/c/Program\ Files/Java/jdk1.8.0_45
-export PATH=$JAVA_HOME/bin:$PATH
+#export JAVA_HOME=/cygdrive/c/Program\ Files/Java/jdk1.8.0_45
+export JAVA_HOME="$PWD/zulu-jdk8-64bit"
 
-echo "+ Set JAVA_HOME=$JAVA_HOME and updated PATH"
+if [ ! -d "$JAVA_HOME" ] ; then
+   echo "$JAVA_HOME not found. Exiting..." >&2
+   return
+fi
+   
+export PATH="$JAVA_HOME/bin:$PATH"
+echo + "Set JAVA_HOME to local instance and updated PATH"
 
-export ANT_HOME=`pwd`/ant
+
+echo "**** Need to optionally test for local Perl5 and if preset add it in"
+
+export ANT_HOME="$PWD/ant"
 export PATH=$ANT_HOME/bin:$PATH