[jboss-cvs] JBossAS SVN: r70895 - trunk/main/src/bin.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 16 15:36:25 EDT 2008
Author: mladen.turk at jboss.com
Date: 2008-03-16 15:36:25 -0400 (Sun, 16 Mar 2008)
New Revision: 70895
Modified:
trunk/main/src/bin/run.bat
Log:
Couple of fixes for run.bat so it can be used from services. In essence the PATH is modified to include the native libaries if found. Also Fix the trailing backslash bug for -Djava.* quoted options
Modified: trunk/main/src/bin/run.bat
===================================================================
--- trunk/main/src/bin/run.bat 2008-03-16 12:21:19 UTC (rev 70894)
+++ trunk/main/src/bin/run.bat 2008-03-16 19:36:25 UTC (rev 70895)
@@ -1,26 +1,86 @@
@echo off
rem -------------------------------------------------------------------------
-rem JBoss Bootstrap Script for Win32
+rem JBoss Bootstrap Script for Windows
rem -------------------------------------------------------------------------
rem $Id: run.bat 63250 2007-05-30 13:22:21Z dimitris at jboss.org $
@if not "%ECHO%" == "" echo %ECHO%
- at if "%OS%" == "Windows_NT" setlocal
+ at if "%OS%" == "Windows_NT" setlocal
-set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
-set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set DIRNAME=.\
+)
pushd %DIRNAME%..
-set JBOSS_HOME=%CD%
+if "x%JBOSS_HOME%" == "x" (
+ set "JBOSS_HOME=%CD%"
+)
popd
-REM Add bin/native to the PATH if present
-if exist "%JBOSS_HOME%\bin\native" set PATH=%JBOSS_HOME%\bin\native;%PATH%
-if exist "%JBOSS_HOME%\bin\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path="%PATH%"
+set DIRNAME=
+if "%OS%" == "Windows_NT" (
+ set "PROGNAME=%~nx0%"
+) else (
+ set "PROGNAME=run.bat"
+)
+
+if "x%JAVA_OPTS%" == "x" (
+ set "JAVA_OPTS=-Dprogram.name=%PROGNAME%"
+) else (
+ set "JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%"
+)
+
+if "x%JAVA_HOME%" == "x" (
+ set JAVA=java
+ echo JAVA_HOME is not set. Unexpected results may occur.
+ echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+ set "JAVA=%JAVA_HOME%\bin\java"
+ if exist "%JAVA_HOME%\lib\tools.jar" (
+ set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
+ )
+)
+
+rem Add -server to the JVM options, if supported
+"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
+if not errorlevel == 1 (
+ set "JAVA_OPTS=%JAVA_OPTS% -server"
+)
+
+rem Set Java platform if 64-Bit JVM used
+set JAVA_PLATFORM=
+"%JAVA%" -version 2>&1 | findstr /I 64-Bit > nul
+if not errorlevel == 1 (
+ if /I "%PROCESSOR_ARCHITECTURE%"=="IA64" (set JAVA_PLATFORM=ia64
+ ) else if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set JAVA_PLATFORM=x64
+ ) else if /I "%PROCESSOR_ARCHITECTURE%"=="x64" (set JAVA_PLATFORM=x64
+ ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64" (set JAVA_PLATFORM=ia64
+ ) else if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (set JAVA_PLATFORM=x64
+ ) else (
+ echo PROCESSOR_ARCHITECTURE is not set. Unexpected results may occur.
+ echo Set PROCESSOR_ARCHITECTURE according to the 64-Bit JVM used.
+ )
+)
+
+if "x%JAVA_PLATFORM%" == "x" set JAVA_PLATFORM=x86
+
+rem Add native to the PATH if present
+set JBOSS_NATIVE_LOC=
+if exist "%JBOSS_HOME%\bin\META-INF\lib\windows-%JAVA_PLATFORM%" (
+ set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\META-INF\lib\windows-%JAVA_PLATFORM%"
+) else if exist "%JBOSS_HOME%\bin\native" (
+ set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\native"
+)
+
+if not "x%JBOSS_NATIVE_HOME%" == "x" (
+ set "PATH=%JBOSS_NATIVE_HOME%;%PATH%"
+ set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path="%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
+)
+
rem Read all command line arguments
REM
@@ -37,52 +97,30 @@
rem Find run.jar, or we can't continue
-set RUNJAR=%JBOSS_HOME%\bin\run.jar
-if exist "%RUNJAR%" goto FOUND_RUN_JAR
-echo Could not locate %RUNJAR%. Please check that you are in the
-echo bin directory when running this script.
-goto END
+if exist "%JBOSS_HOME%\bin\run.jar" (
+ if "x%JAVAC_JAR%" == "x" (
+ set "RUNJAR=%JAVAC_JAR%;%JBOSS_HOME%\bin\run.jar"
+ ) else (
+ set "RUNJAR=%JBOSS_HOME%\bin\run.jar"
+ )
+) else (
+ echo Could not locate "%JBOSS_HOME%\bin\run.jar".
+ echo Please check that you are in the bin directory when running this script.
+ goto END
+)
-:FOUND_RUN_JAR
-
-if not "%JAVA_HOME%" == "" goto ADD_TOOLS
-
-set JAVA=java
-
-echo JAVA_HOME is not set. Unexpected results may occur.
-echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
-goto SKIP_TOOLS
-
-:ADD_TOOLS
-
-set JAVA=%JAVA_HOME%\bin\java
-
-rem A full JDK with toos.jar is not required anymore since jboss web packages
-rem the eclipse jdt compiler and javassist has its own internal compiler.
-if not exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
-
-rem If exists, point to the JDK javac compiler in case the user wants to
-rem later override the eclipse jdt compiler for compiling JSP pages.
-set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
-
-:SKIP_TOOLS
-
-rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this will
+rem If JBOSS_CLASSPATH empty, don't include it, as this will
rem result in including the local directory in the classpath, which makes
rem error tracking harder.
-if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
-if "%JBOSS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%
+if "x%JBOSS_CLASSPATH%" == "x" (
+ set "RUN_CLASSPATH=%RUNJAR%"
+) else (
+ set "RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%"
+)
set JBOSS_CLASSPATH=%RUN_CLASSPATH%
rem Setup JBoss specific properties
-set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
-
-rem Add -server to the JVM options, if supported
-"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
-if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
-
rem JVM memory allocation pool parameters. Modify as appropriate.
set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m -XX:MaxPermSize=256m
@@ -90,7 +128,7 @@
set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
rem JPDA options. Uncomment and modify as appropriate to enable remote debugging.
-rem set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
+rem set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
rem Setup the java endorsed dirs
set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
@@ -101,11 +139,11 @@
echo.
echo JBOSS_HOME: %JBOSS_HOME%
echo.
-echo JAVA: %JAVA%
+echo JAVA : %JAVA%
echo.
-echo JAVA_OPTS: %JAVA_OPTS%
+echo JAVA_OPTS : %JAVA_OPTS%
echo.
-echo CLASSPATH: %JBOSS_CLASSPATH%
+echo CLASSPATH : %JBOSS_CLASSPATH%
echo.
echo ===============================================================================
echo.
@@ -120,6 +158,6 @@
if ERRORLEVEL 10 goto RESTART
:END
-if "%NOPAUSE%" == "" pause
+if "x%NOPAUSE%" == "x" pause
:END_NO_PAUSE
More information about the jboss-cvs-commits
mailing list