Changeset 6467

Timestamp:

2004-01-13T15:38:02+13:00 (20 years ago)

Author:

mdewsnip

Message:

Changed all JAVAHOMEs to JAVA_HOMEs.

Location:

trunk/gli

Files:

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

trunk/gli/document.bat

@@ -17 +17 @@
 if not "%JAVADOCPATH%" == "" goto testJavadoc
 
-    :: If it is set, use the JAVAHOME environment variable
-    if not "%JAVAHOME%" == "" goto javahome
+    :: If it is set, use the JAVA_HOME environment variable
+    if not "%JAVA_HOME%" == "" goto javahome
 
     :: Check if Javadoc is on the search path
@@ -44 +44 @@
 
 :javahome
-    set JAVADOCPATH=%JAVAHOME%\bin
+    set JAVADOCPATH=%JAVA_HOME%\bin
 
 :testJavadoc

trunk/gli/document.sh

@@ -10 +10 @@
 if [ "$javadocpath" == "" ]; then
 
-    # If it is set, use the JAVAHOME environment variable
-    if [ "$JAVAHOME" != "" ]; then
-    javadocpath="$JAVAHOME/bin/javadoc"
+    # If it is set, use the JAVA_HOME environment variable
+    if [ "$JAVA_HOME" != "" ]; then
+    javadocpath="$JAVA_HOME/bin/javadoc"
 
     # Check if Javadoc is on the search path

trunk/gli/gli.bat

@@ -112 +112 @@
 if not "%JAVAPATH%" == "" goto testJava
 
-    :: If it is set, use the JAVAHOME environment variable
-    if not "%JAVAHOME%" == "" goto javahome
+    :: If it is set, use the JAVA_HOME environment variable
+    if not "%JAVA_HOME%" == "" goto javahome
 
     :: Check if Java is on the search path
@@ -144 +144 @@
 
 :javahome
-    set JAVAPATH=%JAVAHOME%\bin
+    set JAVAPATH=%JAVA_HOME%\bin
 
 :testJava

trunk/gli/gli.sh

@@ -78 +78 @@
 if [ "$javapath" == "" ]; then
 
-    # If it is set, use the JAVAHOME environment variable
-    if [ "$JAVAHOME" != "" ]; then
-    javapath="$JAVAHOME/bin/java"
+    # If it is set, use the JAVA_HOME environment variable
+    if [ "$JAVA_HOME" != "" ]; then
+    javapath="$JAVA_HOME/bin/java"
 
     # Check if Java is on the search path

trunk/gli/makegli.bat

@@ -23 +23 @@
 if not "%JAVACPATH%" == "" goto testJavac
 
-    :: If it is set, use the JAVAHOME environment variable
-    if not "%JAVAHOME%" == "" goto javahome
+    :: If it is set, use the JAVA_HOME environment variable
+    if not "%JAVA_HOME%" == "" goto javahome
 
     :: Check if Javac is on the search path
@@ -50 +50 @@
 
 :javahome
-    set JAVACPATH=%JAVAHOME%\bin
+    set JAVACPATH=%JAVA_HOME%\bin
 
 :testJavac

trunk/gli/makegli.sh

@@ -16 +16 @@
 if [ "$javacpath" == "" ]; then
 
-    # If it is set, use the JAVAHOME environment variable
-    if [ "$JAVAHOME" != "" ]; then
-    javacpath="$JAVAHOME/bin/javac"
+    # If it is set, use the JAVA_HOME environment variable
+    if [ "$JAVA_HOME" != "" ]; then
+    javacpath="$JAVA_HOME/bin/javac"
 
     # Check if Javac is on the search path