[jboss-cvs] JBossAS SVN: r92223 - branches/JBPAPP_5_0/main/src/bin.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 11 03:30:26 EDT 2009
Author: mladen.turk at jboss.com
Date: 2009-08-11 03:30:26 -0400 (Tue, 11 Aug 2009)
New Revision: 92223
Modified:
branches/JBPAPP_5_0/main/src/bin/run.bat
Log:
Fix JBPAPP-2438. Window command processor doesn't allow variable modifications once when set. Also fix double quotation problem with -Djava.library.path
Modified: branches/JBPAPP_5_0/main/src/bin/run.bat
===================================================================
--- branches/JBPAPP_5_0/main/src/bin/run.bat 2009-08-11 07:28:40 UTC (rev 92222)
+++ branches/JBPAPP_5_0/main/src/bin/run.bat 2009-08-11 07:30:26 UTC (rev 92223)
@@ -64,22 +64,24 @@
rem Add native to the PATH if present
set JBOSS_NATIVE_HOME=
+set CHECK_NATIVE_HOME=
if exist "%JBOSS_HOME%\bin\libtcnative-1.dll" (
- set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin"
+ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\bin"
) else if exist "%JBOSS_HOME%\..\native\bin" (
- set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\..\native\bin"
-) else if exist "%JBOSS_HOME%\bin\native" (
- set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\native"
+ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\native\bin"
+) else if exist "%JBOSS_HOME%\bin\native\bin" (
+ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\bin\native\bin"
)
-if "x%JBOSS_NATIVE_HOME%" == "x" goto WITHOUT_JBOSS_NATIVE
+if "x%CHECK_NATIVE_HOME%" == "x" goto WITHOUT_JBOSS_NATIVE
rem Translate to the absolute path
-pushd "%JBOSS_NATIVE_HOME%"
-set %JBOSS_NATIVE_HOME%="%CD%"
+pushd "%CHECK_NATIVE_HOME%"
+set JBOSS_NATIVE_HOME=%CD%
popd
-set PATH="%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
+set CHECK_JBOSS_NATIVE_HOME=
set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
+set PATH=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%
:WITHOUT_JBOSS_NATIVE
rem Find run.jar, or we can't continue
More information about the jboss-cvs-commits
mailing list