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

[Kevin Klues]

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

Modified Files:
	tos-install-jni.in tos-locate-jre 
Log Message:
Added support for MAC OS in tools compilation

Index: tos-install-jni.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-install-jni.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tos-install-jni.in	6 Jun 2007 22:40:18 -0000	1.3
--- tos-install-jni.in	7 Jun 2007 07:22:18 -0000	1.4
***************
*** 11,15 ****
  fi
  
! if cygpath -w / >/dev/null 2>/dev/null; then
    echo "Installing Java JNI code in $jni ... "
    for lib in $tinyoslibdir/*. at JNISUFFIX@; do 
--- 11,15 ----
  fi
  
! if [ cygpath -w / >/dev/null 2>/dev/null ] || [ `uname` == "Darwin" ]; then
    echo "Installing Java JNI code in $jni ... "
    for lib in $tinyoslibdir/*. at JNISUFFIX@; do 

Index: tos-locate-jre
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-locate-jre,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tos-locate-jre	9 Jan 2007 20:49:25 -0000	1.3
--- tos-locate-jre	7 Jun 2007 07:22:18 -0000	1.4
***************
*** 50,53 ****
--- 50,58 ----
      ;;
  
+     Darwin)
+     #Just statically typed in, uses default location of installation for XTools.  May need to be fixed
+     jhome=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK
+     ;;
+ 
      Linux)
      # Check gentoo java configuration
***************
*** 109,113 ****
      # Windows, and IBM Java: in jre/bin
      # Sun Java on Linux: in jre/lib/i386
!     if "$jhome/bin/java" -version 2>&1 | grep -q IBM || cygpath -w / >/dev/null 2>/dev/null; then
  	jnilocate "$jhome/jre/bin" || jnilocate "$jhome/bin"
      else
--- 114,120 ----
      # Windows, and IBM Java: in jre/bin
      # Sun Java on Linux: in jre/lib/i386
!     if [ `uname` = "Darwin" ]; then 
! 	jnilocate "/Library/java/Extensions"
!     elif "$jhome/bin/java" -version 2>&1 | grep -q IBM || cygpath -w / >/dev/null 2>/dev/null; then
  	jnilocate "$jhome/jre/bin" || jnilocate "$jhome/bin"
      else
***************
*** 119,125 ****
      fi
  elif [ "$javac" = "yes" ]; then
!  dir="$jhome/bin"
  elif [ "$java" = "yes" ]; then
!  dir="$jhome/bin"
  fi
  
--- 126,140 ----
      fi
  elif [ "$javac" = "yes" ]; then
!  if [ `uname` = "Darwin" ]; then
!    dir="$jhome/Commands"
!  else 
!    dir="$jhome/bin"
!  fi
  elif [ "$java" = "yes" ]; then
!  if [ `uname` = "Darwin" ]; then  
!    dir="$jhome/Commands"
!  else 
!    dir="$jhome/bin"
!  fi
  fi