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

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

Author: mladen.turk at jboss.com
Date: 2008-04-10 02:19:34 -0400 (Thu, 10 Apr 2008)
New Revision: 71875

Modified:
   trunk/main/src/bin/run.sh
Log:
Use new jboss-native packaging convention for detecting if native is present

Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2008-04-10 06:18:54 UTC (rev 71874)
+++ trunk/main/src/bin/run.sh	2008-04-10 06:19:34 UTC (rev 71875)
@@ -155,19 +155,64 @@
     fi
 fi
 
-# Setup JBosst Native library path
-JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native"
+# Setup JBoss Native library path
+# Use the common JBoss Native convention
+# for packing platform binaries
+#
+JBOSS_NATIVE_CPU=`uname -m`
+case "$JBOSS_NATIVE_CPU" in
+  sun4u*)
+    JBOSS_NATIVE_CPU="sparcv9"
+  ;;
+  i86pc*)
+    JBOSS_NATIVE_CPU="x86"
+  ;;
+  i[3-6]86*)
+    JBOSS_NATIVE_CPU="x86"
+  ;;
+  x86_64*)
+    JBOSS_NATIVE_CPU="x64"
+  ;;
+  ia64*)
+    JBOSS_NATIVE_CPU="i64"
+  ;;
+  9000/800*)
+    JBOSS_NATIVE_CPU="parisc2"
+  ;;
+  Power*)
+    JBOSS_NATIVE_CPU="ppc"
+  ;;
+esac
+
+JBOSS_NATIVE_SYS=`uname -s`
+case "$JBOSS_NATIVE_SYS" in
+  Linux*)
+    JBOSS_NATIVE_SYS="linux2"
+  ;;
+  SunOS*)
+    JBOSS_NATIVE_SYS="solaris"
+  ;;
+  HP-UX*)
+    JBOSS_NATIVE_SYS="hpux"
+  ;;
+  CYGWIN*)
+    JBOSS_NATIVE_SYS="windows"
+  ;;
+esac
+
+JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/META-INF/lib/$JBOSS_NATIVE_SYS/$JBOSS_NATIVE_CPU"
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin ; then
         export PATH="$JBOSS_NATIVE_DIR:$PATH"
-        JBOSS_NATIVE_DIR=`cygpath --dos "$JBOSS_NATIVE_DIR"`
-    fi
-    if [ "x$LD_LIBRARY_PATH" = "x" ]; then
-        LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
+        JBOSS_NATIVE_DIR=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
-        LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
+        if [ "x$LD_LIBRARY_PATH" = "x" ]; then
+          LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR"
+        else
+          LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
+        fi
+        export LD_LIBRARY_PATH
     fi
-    export LD_LIBRARY_PATH
     if [ "x$JAVA_OPTS" = "x" ]; then
         JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
     else