Changeset 35588 for local/greenstone3

Timestamp:

2021-10-14T15:20:42+13:00 (3 years ago)

Author:

davidb

Message:

Some tidy up (mostly removing commented out lines) to gs3-setup.bat

File:

• local/greenstone3/windows-64bit/gs3-setup.bat (modified) (2 diffs)

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

@@ -1 +1 @@
 @echo off
 
-::set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_45
-::set JAVA_HOME=C:\PROGRA~1\Java\JDK18~1.0_4
-::set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_55
-set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_20
+::set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_20
+set JAVA_HOME=%CD%\zulu-jdk8
+::set JAVA_HOME=%CD%\zulu-jdk11
+
 if not exist "%JAVA_HOME%" (
-echo %JAVA_HOME% not found. Exiting...
-goto done
+   echo %JAVA_HOME% not found. Exiting...
+   goto done
 )
 set PATH=%JAVA_HOME%\bin;%PATH%
+echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH
 
-echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH
-set PERL_HOME=C:\strawberry-perl32no64\perl
 
-::set ANT_HOME=%CD%\ant-1.8.3
+::set PERL_HOME=C:\strawberry-perl-64bit\perl
+set PERL_HOME=%CD%\strawberry-perl5\perl
+echo + Set PERL_HOME=%PERL_HOME% and updated PATH
+
 set ANT_HOME=%CD%\apache-ant-1.9.5
-
 set PATH=%PERL_HOME%\bin;%ANT_HOME%\bin;%PATH%
-
 echo + Set ANT_HOME=%ANT_HOME% and updated PATH
 
-echo + Set PERL_HOME=%PERL_HOME% and updated PATH
 
 :: Already done in gs3-devel.bat
@@ -30 +29 @@
 rem popd
 
+
+
+
 :done