[jboss-cvs] JBossAS SVN: r63250 - trunk/system/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2007-05-30 09:22:21 -0400 (Wed, 30 May 2007)
New Revision: 63250

Modified:
   trunk/system/src/bin/run.bat
Log:
JBAS-4418, run.bat should include %PATH% in java.library.path when bin/native exists

Modified: trunk/system/src/bin/run.bat
===================================================================
--- trunk/system/src/bin/run.bat	2007-05-30 13:20:25 UTC (rev 63249)
+++ trunk/system/src/bin/run.bat	2007-05-30 13:22:21 UTC (rev 63250)
@@ -8,24 +8,18 @@
 @if not "%ECHO%" == ""  echo %ECHO%
 @if "%OS%" == "Windows_NT"  setlocal
 
-if "%OS%" == "Windows_NT" (
-set "DIRNAME=%~dp0%"
-set "PROGNAME=%~nx0%"
-) else (
 set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
 set PROGNAME=run.bat
-)
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
-
 pushd %DIRNAME%..
 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%"
-set "JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%JBOSS_HOME%\bin\native"
-)
+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%"
 
 rem Read all command line arguments
 
@@ -77,12 +71,11 @@
 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 "JBOSS_CLASSPATH=%RUNJAR%"
-) else (
-set "JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%"
-)
+if "%JBOSS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
+if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%
 
+set JBOSS_CLASSPATH=%RUN_CLASSPATH%
+
 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%