Changeset 35689

Timestamp:

2021-10-24T16:23:57+13:00 (3 years ago)

Author:

davidb

Message:

Additional testing added in, and echo statements tweaked

File:

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

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

@@ -2 +2 @@
 
 ::set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_20
-set JAVA_HOME=%CD%\zulu-jdk8
-::set JAVA_HOME=%CD%\zulu-jdk11
+set JAVA_HOME=%CD%\zulu-jdk8-64bit
+::set JAVA_HOME=%CD%\zulu-jdk11-64bit
 
 if not exist "%JAVA_HOME%" (
@@ -10 +10 @@
 )
 set PATH=%JAVA_HOME%\bin;%PATH%
-echo + Set JAVA_HOME=%JAVA_HOME% and updated PATH
+echo + Set JAVA_HOME to local instance and updated PATH
 
 
 ::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 PERL_HOME=%CD%\strawberry-perl5-64bit\perl
+
+if not exist "%PERL_HOME%" (
+   echo %PERL_HOME% not found. Exiting...
+   goto done
+)
+echo + Set PERL_HOME to local instance and updated PATH
 
 set ANT_HOME=%CD%\apache-ant-1.9.5
+
+if not exist "%ANT_HOME%" (
+   echo %ANT_HOME% not found. Exiting...
+   goto done
+)
 set PATH=%PERL_HOME%\bin;%ANT_HOME%\bin;%PATH%
-echo + Set ANT_HOME=%ANT_HOME% and updated PATH
-
-
-:: Already done in gs3-devel.bat
-rem pushd "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC"
-:: pushd "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC"
-::call vcvarsall.bat"" amd64
-rem call vcvarsall.bat amd64
-rem popd
-
-
+echo + Set ANT_HOME to local instance and updated PATH