Changeset 20898

Timestamp:

11/06/07 09:45:12 (1 year ago)

Author:

patrick

Message:

Merges from the trunk:

r20892: Add some whitespace in an effort to make this code more readable.

r20893: When exiting with an error, pause so that the user has a chance to

see what went wrong. This is very helpful in situations where this
batch file is launched by double-clicking.

r20894: If neither of the environment variables JAVA_HOME nor JDK_HOME are

set, then look in the registry for the Java installation path.

r20895: Added a missing error-out case.

r20896: Improved the formatting of outupt text.

r20897: Fixed a logic error that prevented -DJCCL_DEFINITION_PATH from

being added to the java.exe command line when the
JCCL_DEFINITION_PATH environment variable was set. This was not
really a big deal since we have changed the minimum required
version of Java to 1.5 (which has the ability to query environment
variables rather than relying on command line value definitions).

Files:

• juggler/branches/2.2/modules/vrjuggler/vrjconfig/vrjconfig.bat (modified) (5 diffs)

juggler/branches/2.2/modules/vrjuggler/vrjconfig/vrjconfig.bat

@@ -25 +25 @@
-rem
-rem ************** <auto-copyright.pl END do not edit this line> **************
+
+rem Determine if either of the environment variables JAVA_HOME or JDK_HOME is
+rem set. Ultimately, our goal is to have a valid value for JAVA_HOME.
-IF NOT "%JAVA_HOME%" == "" GOTO TEST_JAVA_EXIST
-ERR
+REG
-ECHO [NOTE] Setting JAVA_HOME to "%JDK_HOME%"
-set JAVA_HOME=%JDK_HOME%
-GOTO TEST_JAVA_EXIST
+
+rem Neither JAVA_HOME nor JDK_HOME is set, so try to find the Java
+rem installation path in the registry.
+:JAVA_REG
+rem Look for Java 1.5 first.
+FOR /F "usebackq tokens=2* delims=       " %%A IN (`reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.5" /v JavaHome`) DO set JAVA_HOME=%%B
+IF NOT "%JAVA_HOME%" == "" GOTO TEST_JAVA_EXIST
+rem Then try Java 1.6.
+FOR /F "usebackq tokens=2* delims=       " %%A IN (`reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\1.6" /v JavaHome`) DO set JAVA_HOME=%%B
+IF NOT "%JAVA_HOME%" == "" GOTO TEST_JAVA_EXIST
+
-:JAVA_ERR
+rem If we reached this point, we were not able to get a value for JAVA_HOME or
+rem JDK_HOME.
-ECHO [ERR] Neither JAVA_HOME nor JDK_HOME is set.  One of these environment
-ECHO [ERR] variables must be set to a valid Java 1.4 or newer installation
-ECHO [ERR] directory to run VRJConfig.
-GOTO ERREXIT
+
-:TEST_JAVA_EXIST
+rem Remove the trailing backslash from JAVA_HOME if it has one.
+IF "%JAVA_HOME:~-1%" == "\" set JAVA_HOME=%JAVA_HOME:~0,-1%
+
-IF EXIST "%JAVA_HOME%\bin\java.exe" GOTO TEST_VJ_BASE
-
-
+
+
+
+
-:TEST_VJ_BASE
-IF NOT "%VJ_BASE_DIR%" == "" GOTO TEST_VJ_EXIST
@@ -44 +66 @@
-ECHO NOTE: VJ_BASE_DIR environment variable unset; defaulting to
-ECHO       %VJ_BASE_DIR%
-
-
+ correctly.
+
-:TEST_VJ_EXIST
-IF EXIST "%VJ_BASE_DIR%" GOTO TEST_TWEEK_BASE
@@ -51 +73 @@
-ECHO [ERR] check the path and try again.
-GOTO ERREXIT
+
-:TEST_TWEEK_BASE
-IF NOT "%TWEEK_BASE_DIR%" == "" GOTO TEST_TWEEK_EXIST
-ECHO  NOTE: Setting TWEEK_BASE_DIR to "%VJ_BASE_DIR%"
-set TWEEK_BASE_DIR=%VJ_BASE_DIR%
+
-:TEST_TWEEK_EXIST
-IF EXIST "%TWEEK_BASE_DIR%" GOTO TEST_JCCL_BASE
@@ -60 +84 @@
-ECHO [ERR] check the path and try again.
-GOTO ERREXIT
+
-:TEST_JCCL_BASE
-IF NOT "%JCCL_BASE_DIR%" == "" GOTO TEST_JCCL_EXIST
-ECHO  NOTE: Setting JCCL_BASE_DIR to "%VJ_BASE_DIR%"
-set JCCL_BASE_DIR=%VJ_BASE_DIR%
+
-:TEST_JCCL_EXIST
-IF EXIST "%JCCL_BASE_DIR%" GOTO TEST_JCCL_DEF
@@ -69 +95 @@
-ECHO [ERR] check the path and try again.
-GOTO ERREXIT
+
-:TEST_JCCL_DEF
-NOT 
+
-set jccl_def_arg=-DJCCL_DEFINITION_PATH="%JCCL_DEFINITION_PATH%"
+
-:RUNJAVA
-"%JAVA_HOME%\bin\java" -DTWEEK_BASE_DIR="%TWEEK_BASE_DIR%" -DTWEEK_DATA_DIR="share\tweek" -DJCCL_BASE_DIR="%JCCL_BASE_DIR%" -DJCCL_DATA_DIR="share\jccl" -DVJ_BASE_DIR="%VJ_BASE_DIR%" -DVJ_DATA_DIR="share\vrjuggler" %jccl_def_arg% -Djava.library.path="%TWEEK_BASE_DIR%\share\tweek\java\%PROCESSOR_ARCHITECTURE%" -Djava.security.policy="%TWEEK_BASE_DIR%\share\tweek\java\java.security.policy.txt" -cp "%TWEEK_BASE_DIR%\share\tweek\java\jaxen-core.jar;%TWEEK_BASE_DIR%\share\tweek\java\jaxen-jdom.jar;%TWEEK_BASE_DIR%\share\tweek\java\jdom.jar;%TWEEK_BASE_DIR%\share\tweek\java\saxpath.jar;%TWEEK_BASE_DIR%\share\tweek\java\xalan.jar;%TWEEK_BASE_DIR%\share\tweek\java\xerces.jar;%TWEEK_BASE_DIR%\share\tweek\java\xml-apis.jar;%TWEEK_BASE_DIR%\share\tweek\java\Tweek.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekBeans.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekEvents.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekNet.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekBeanDelivery.jar;%TWEEK_BASE_DIR%\share\tweek\java\TweekServices.jar;%TWEEK_BASE_DIR%\share\tweek\java\kunststoff-mod.jar;%TWEEK_BASE_DIR%\share\tweek\java\liquidlnf.jar;%TWEEK_BASE_DIR%\share\tweek\java\metouia.jar;%TWEEK_BASE_DIR%\share\tweek\java\looks.jar" org.vrjuggler.tweek.Tweek --beanpath="%JCCL_BASE_DIR%\share\jccl\beans" --beanpath="%VJ_BASE_DIR%\share\vrjuggler\beans" --defaultbean="Configuration Editor" %*
-GOTO DONE
+
-:ERREXIT
-ECHO [ERR] VRJConfig exiting due to previous errors.
+PAUSE
+
-:DONE