[jboss-cvs] JBossAS SVN: r93638 - branches/Branch_5_x/main/src/bin.

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

Author: jfrederic.clere at jboss.com
Date: 2009-09-17 07:52:51 -0400 (Thu, 17 Sep 2009)
New Revision: 93638

Modified:
   branches/Branch_5_x/main/src/bin/run.sh
Log:
Merge changes from trunk.


Modified: branches/Branch_5_x/main/src/bin/run.sh
===================================================================
--- branches/Branch_5_x/main/src/bin/run.sh	2009-09-17 11:40:17 UTC (rev 93637)
+++ branches/Branch_5_x/main/src/bin/run.sh	2009-09-17 11:52:51 UTC (rev 93638)
@@ -205,12 +205,34 @@
   ;;
 esac
 
-JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/META-INF/lib/$JBOSS_NATIVE_SYS/$JBOSS_NATIVE_CPU"
+if [ -d "$JBOSS_HOME/bin/META-INF/lib/$JBOSS_NATIVE_SYS/$JBOSS_NATIVE_CPU" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/bin/META-INF/lib/$JBOSS_NATIVE_SYS/$JBOSS_NATIVE_CPU" && pwd`
+elif [ -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`
+elif [ -d "$JBOSS_HOME/bin/native" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/bin/native" && pwd`
+fi
+
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin ; then
+        if [ -d "$JBOSS_NATIVE_DIR/bin" ]; then
+            JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
+        fi
         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
+            if [ -d "$JBOSS_NATIVE_DIR/lib64" ]; then
+                JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
+            fi
+        else
+            if [ -d "$JBOSS_NATIVE_DIR/lib64" ]; then
+                JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib"
+            fi
+        fi
         if [ "x$LD_LIBRARY_PATH" = "x" ]; then
           LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
         else