[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/misc tos-install-jni.in, 1.2, 1.3

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19157/tinyos/misc

Modified Files:
	tos-install-jni.in 
Log Message:
build both 32 and 64-bit versions of the JNI code so as to support both
32 and 64-bit JDKs
install the appropriate JNI version depending on whether the JDK is 32 or 64-bit

all this is for Linux only for now


Index: tos-install-jni.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-install-jni.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tos-install-jni.in	12 Jul 2006 17:00:50 -0000	1.2
--- tos-install-jni.in	6 Jun 2007 22:40:18 -0000	1.3
***************
*** 10,16 ****
    exit 1
  fi
! echo "Installing Java JNI code in $jni ... "
! for lib in $tinyoslibdir/*. at JNISUFFIX@; do 
!   @INSTALLJNI@ $lib "$jni" || exit 1
! done
  echo "done."
--- 10,32 ----
    exit 1
  fi
! 
! if cygpath -w / >/dev/null 2>/dev/null; then
!   echo "Installing Java JNI code in $jni ... "
!   for lib in $tinyoslibdir/*. at JNISUFFIX@; do 
!     @INSTALLJNI@ $lib "$jni" || exit 1
!   done
! else
!   java=`tos-locate-jre --java`
!   bits=32
!   if [ $? -ne 0 ]; then
!     echo "java command not found - assuming 32 bits"
!   elif file -L $java/java | grep -q 64-bit; then
!     bits=64
!   fi
!   echo "Installing $bits-bit Java JNI code in $jni ... "
!   for lib in $tinyoslibdir/*-$bits. at JNISUFFIX@; do 
!     realname=`basename $lib | sed -e s/-$bits\. at JNISUFFIX@/. at JNISUFFIX@/`
!     @INSTALLJNI@ $lib "$jni/$realname" || exit 1
!   done
! fi
  echo "done."