[jboss-cvs] JBossAS SVN: r91703 - trunk/main/src/bin.

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

Author: mladen.turk at jboss.com
Date: 2009-07-28 03:21:53 -0400 (Tue, 28 Jul 2009)
New Revision: 91703

Modified:
   trunk/main/src/bin/run.bat
   trunk/main/src/bin/run.sh
Log:
Check for native dir in upper directory as well. Allows to drop in the natives inside EAP directory layout

Modified: trunk/main/src/bin/run.bat
===================================================================
--- trunk/main/src/bin/run.bat	2009-07-28 06:57:32 UTC (rev 91702)
+++ trunk/main/src/bin/run.bat	2009-07-28 07:21:53 UTC (rev 91703)
@@ -55,15 +55,21 @@
 set JBOSS_NATIVE_HOME=
 if exist "%JBOSS_HOME%\bin\libtcnative-1.dll" (
   set "JBOSS_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"
 )
+if "x%JBOSS_NATIVE_HOME%" == "x" goto WITHOUT_JBOSS_NATIVE
 
-if not "x%JBOSS_NATIVE_HOME%" == "x" (
-  set "PATH=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
-  set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
-)
+rem Translate to the absolute path
+pushd "%JBOSS_NATIVE_HOME%"
+set %JBOSS_NATIVE_HOME%="%CD%"
+popd
+set PATH="%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
+set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
 
+:WITHOUT_JBOSS_NATIVE
 rem Find run.jar, or we can't continue
 
 if exist "%JBOSS_HOME%\bin\run.jar" (

Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2009-07-28 06:57:32 UTC (rev 91702)
+++ trunk/main/src/bin/run.sh	2009-07-28 07:21:53 UTC (rev 91703)
@@ -157,21 +157,23 @@
 
 # Setup JBoss Native library path
 #
-if $cygwin ; then
-    JBOSS_NATIVE_DIR="$JBOSS_HOME/bin"
-    export PATH="$JBOSS_NATIVE_DIR:$PATH"
-else
-    IS_64_BIT_JVM=`"$JAVA" -version 2>&1 | $GREP -i 64-bit`
-    if [ "x$IS_64_BIT_JVM" != "x" ]; then
-        JBOSS_NATIVE_DIR="$JBOSS_HOME/lib64"
-    else
-        JBOSS_NATIVE_DIR="$JBOSS_HOME/lib"
-    fi
+if [ -d "$JBOSS_HOME/../native/bin" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd`
+elif [ -d "$JBOSS_HOME/native/bin" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
 fi
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin; then
+        JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
+        export PATH="$JBOSS_NATIVE_DIR:$PATH"
         JBOSS_NATIVE_DIR=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
+        IS_64_BIT_JVM=`"$JAVA" -version 2>&1 | $GREP -i 64-bit`
+        if [ "x$IS_64_BIT_JVM" != "x" ]; then
+            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
+        else
+            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
+        fi
         if [ "x$LD_LIBRARY_PATH" = "x" ]; then
           LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
         else