Changeset 5015

Timestamp:

2003-07-23T15:23:39+12:00 (21 years ago)

Author:

mdewsnip

Message:

Modified to reflect movement of Windows utility programs into winutil\.

Location:

trunk/gli

Files:

• document.bat (modified) (2 diffs)
• gli.bat (modified) (4 diffs)
• makegli.bat (modified) (2 diffs)

trunk/gli/document.bat

@@ -15 +15 @@
 
     :: Check if Javadoc is on the search path
-    echo %PATH%| which javadoc.exe | setvar JAVADOCPATH > setjavadoc.bat
+    echo %PATH%| winutil\which javadoc.exe | winutil\setvar JAVADOCPATH > setjavadoc.bat
     call setjavadoc.bat
     del setjavadoc.bat
@@ -25 +25 @@
     del jdk.reg 2> nul
 
-    findjava jdk.txt | setvar JAVADOCPATH > setjavadoc.bat
+    winutil\findjava jdk.txt | winutil\setvar JAVADOCPATH > setjavadoc.bat
     del jdk.txt 2> nul
     call setjavadoc.bat

trunk/gli/gli.bat

@@ -51 +51 @@
 
     :: Check if Perl is on the search path
-    echo %PATH%| which perl.exe | setvar PERLPATH > setperl.bat
+    echo %PATH%| winutil\which perl.exe | winutil\setvar PERLPATH > setperl.bat
+    call setperl.bat
+    del setperl.bat
+    if not "%PERLPATH%" == "" goto testPerl
+
+    :: If not, try GSDLHOME\bin\windows\perl\bin
+    if exist "%GSDLHOME%\bin\windows\perl\bin\perl.exe" goto gsdlPerl
+
+    :: Still haven't found anything, so try looking in the registry (gulp!)
+    regedit /E perl.reg "HKEY_LOCAL_MACHINE\SOFTWARE\Perl"
+    type perl.reg > perl.txt 2> nul
+    del perl.reg 2> nul
+
+    winutil\findperl perl.txt | winutil\setvar PERLPATH > setperl.bat
+    del perl.txt 2> nul
     call setperl.bat
     del setperl.bat
 
-    :: If not, try GSDLHOME\bin\windows\perl\bin
-    if not "%PERLPATH%" == "" goto testPerl
-        set PERLPATH=%GSDLHOME%\bin\windows\perl\bin
+    :: If nothing was found in the registry, we're stuck
+    if "%PERLPATH%" == "" goto noPerl
+
+    goto testPerl
+
+:gsdlPerl
+    set PERLPATH=%GSDLHOME%\bin\windows\perl\bin
 
 :testPerl
@@ -63 +81 @@
 echo Checking Perl: %PERLPATH%
 if exist "%PERLPATH%\perl.exe" goto findJava
+
+:noPerl
     echo.
     echo The Greenstone Librarian Interface requires perl in order to operate,
@@ -81 +101 @@
 
     :: Check if Java is on the search path
-    echo %PATH%| which java.exe | setvar JAVAPATH > setjava.bat
+    echo %PATH%| winutil\which java.exe | winutil\setvar JAVAPATH > setjava.bat
     call setjava.bat
     del setjava.bat
@@ -94 +114 @@
     del jre.reg 2> nul
 
-    findjava jdk.txt jre.txt | setvar JAVAPATH > setjava.bat
+    winutil\findjava jdk.txt jre.txt | winutil\setvar JAVAPATH > setjava.bat
     del jdk.txt 2> nul
     del jre.txt 2> nul

trunk/gli/makegli.bat

@@ -15 +15 @@
 
     :: Check if Javac is on the search path
-    echo %PATH%| which javac.exe | setvar JAVACPATH > setjavac.bat
+    echo %PATH%| winutil\which javac.exe | winutil\setvar JAVACPATH > setjavac.bat
     call setjavac.bat
     del setjavac.bat
@@ -25 +25 @@
     del jdk.reg 2> nul
 
-    findjava jdk.txt | setvar JAVACPATH > setjavac.bat
+    winutil\findjava jdk.txt | winutil\setvar JAVACPATH > setjavac.bat
     del jdk.txt 2> nul
     call setjavac.bat