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

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

Author: mladen.turk at jboss.com
Date: 2009-07-27 14:17:29 -0400 (Mon, 27 Jul 2009)
New Revision: 91685

Modified:
   trunk/main/src/bin/run.bat
   trunk/main/src/bin/run.sh
Log:
Simplify the native location check and library load

Modified: trunk/main/src/bin/run.bat
===================================================================
--- trunk/main/src/bin/run.bat	2009-07-27 18:14:21 UTC (rev 91684)
+++ trunk/main/src/bin/run.bat	2009-07-27 18:17:29 UTC (rev 91685)
@@ -51,34 +51,17 @@
   set "JAVA_OPTS=%JAVA_OPTS% -server"
 )
 
-rem Set Java platform if 64-Bit JVM used
-set JAVA_PLATFORM=
-"%JAVA%" -version 2>&1 | findstr /I "64-Bit ^| x86_64" > nul
-if not errorlevel == 1 (
-  if /I "%PROCESSOR_ARCHITECTURE%"=="IA64"  (set JAVA_PLATFORM=ia64
-  ) else if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set JAVA_PLATFORM=x64
-  ) else if /I "%PROCESSOR_ARCHITECTURE%"=="x64"   (set JAVA_PLATFORM=x64
-  ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64"  (set JAVA_PLATFORM=i64
-  ) else if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (set JAVA_PLATFORM=x64
-  ) else (
-    echo PROCESSOR_ARCHITECTURE is not set. Unexpected results may occur.
-    echo Set PROCESSOR_ARCHITECTURE according to the 64-Bit JVM used.
-  )
-)
-
-if "x%JAVA_PLATFORM%" == "x" set JAVA_PLATFORM=x86
-
 rem Add native to the PATH if present
-set JBOSS_NATIVE_LOC=
-if exist "%JBOSS_HOME%\bin\META-INF\lib\windows\%JAVA_PLATFORM%" (
-  set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\META-INF\lib\windows\%JAVA_PLATFORM%"
+set JBOSS_NATIVE_HOME=
+if exist "%JBOSS_HOME%\bin\libtcnative-1.dll" (
+  set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin"
 ) else if exist "%JBOSS_HOME%\bin\native" (
   set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\native"
 )
 
 if not "x%JBOSS_NATIVE_HOME%" == "x" (
-  set "PATH=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
-  set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
+  set "PATH=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
+  set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%SYSTEMROOT%"
 )
 
 rem Find run.jar, or we can't continue

Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2009-07-27 18:14:21 UTC (rev 91684)
+++ trunk/main/src/bin/run.sh	2009-07-27 18:17:29 UTC (rev 91685)
@@ -156,54 +156,20 @@
 fi
 
 # 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 $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
+fi
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
-    if $cygwin ; then
-        export PATH="$JBOSS_NATIVE_DIR:$PATH"
+    if $cygwin; then
         JBOSS_NATIVE_DIR=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
         if [ "x$LD_LIBRARY_PATH" = "x" ]; then