Changeset 5021

Timestamp:

2003-07-24T13:56:44+12:00 (21 years ago)

Author:

mdewsnip

Message:

These scripts are now more compatible with Windows 95/98. Turns out there is no way to redirect standard error with these two OSs, so strange error messages were appearing.

Location:

trunk/gli

Files:

• document.bat (modified) (1 diff)
• gli.bat (modified) (2 diffs)
• makegli.bat (modified) (2 diffs)

trunk/gli/document.bat

@@ -21 +21 @@
 
     :: Still haven't found anything, so try looking in the registry (gulp!)
+    type nul > jdk.reg
     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
-    type jdk.reg > jdk.txt 2> nul
-    del jdk.reg 2> nul
+    type jdk.reg > jdk.txt
+    del jdk.reg
 
     winutil\findjava jdk.txt | winutil\setvar JAVADOCPATH > setjavadoc.bat
-    del jdk.txt 2> nul
+    del jdk.txt
     call setjavadoc.bat
     del setjavadoc.bat

trunk/gli/gli.bat

@@ -60 +60 @@
 
     :: Still haven't found anything, so try looking in the registry (gulp!)
+    type nul > perl.reg
     regedit /E perl.reg "HKEY_LOCAL_MACHINE\SOFTWARE\Perl"
-    type perl.reg > perl.txt 2> nul
-    del perl.reg 2> nul
+    type perl.reg > perl.txt
+    del perl.reg
 
     winutil\findperl perl.txt | winutil\setvar PERLPATH > setperl.bat
-    del perl.txt 2> nul
+    del perl.txt
     call setperl.bat
     del setperl.bat
@@ -107 +108 @@
 
     :: Still haven't found anything, so try looking in the registry (gulp!)
+    type nul > jdk.reg
     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
-    type jdk.reg > jdk.txt 2> nul
-    del jdk.reg 2> nul
+    type jdk.reg > jdk.txt
+    del jdk.reg
+    type nul > jre.reg
     regedit /E jre.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment"
-    type jre.reg > jre.txt 2> nul
-    del jre.reg 2> nul
+    type jre.reg > jre.txt
+    del jre.reg
 
     winutil\findjava jdk.txt jre.txt | winutil\setvar JAVAPATH > setjava.bat
-    del jdk.txt 2> nul
-    del jre.txt 2> nul
+    del jdk.txt
+    del jre.txt
     call setjava.bat
     del setjava.bat

trunk/gli/makegli.bat

@@ -21 +21 @@
 
     :: Still haven't found anything, so try looking in the registry (gulp!)
+    type nul > jdk.reg
     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
-    type jdk.reg > jdk.txt 2> nul
-    del jdk.reg 2> nul
+    type jdk.reg > jdk.txt
+    del jdk.reg
 
     winutil\findjava jdk.txt | winutil\setvar JAVACPATH > setjavac.bat
-    del jdk.txt 2> nul
+    del jdk.txt
     call setjavac.bat
     del setjavac.bat
@@ -53 +54 @@
 :checkVer
 :: Check that the version of Javac is new enough (1.4.0 or higher) to compile the GLI
-"%JAVACPATH%\javac.exe" -target 1.4 2> nul
+"%JAVACPATH%\javac.exe" -Xstdout nul -target 1.4
 if not errorlevel 1 goto makeGLI
     echo.