Summary: TinyOS tools
Name: tinyos-tools
-Version: 1.2.3
-Release: 1
+Version: 1.2.4
+Release: 2
License: Please see source
Group: Development/System
URL: http://www.tinyos.net/
echo "Java not found, not installing JNI code"
exit 0
fi
-echo "Installing Java JNI code in $jni ... "
%ifos linux
-for lib in $RPM_INSTALL_PREFIX/lib/tinyos/*.so; do
- install $lib "$jni" || exit 0
+java=`$RPM_INSTALL_PREFIX/bin/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.so; do
+ realname=`basename $lib | sed -e s/-$bits\.so/.so/`
+ install $lib "$jni/$realname" || exit 1
done
%else
+echo "Installing Java JNI code in $jni ... "
for lib in $RPM_INSTALL_PREFIX/lib/tinyos/*.dll; do
install --group=SYSTEM $lib "$jni" || exit 0
done
# Remove JNI code on uninstall
%changelog
+* Sun Jul 29 2007 <pal@cs.stanford.edu> 1.2.4-2
+- Add 64-bit support for Java VMs and deluge tools.
* Wed Jul 5 2006 <kwright@archrock.com> 1.2.2-1
* Thu Feb 9 2006 <david.e.gay@intel.com> 1.2.1-2
* Sat Feb 4 2006 <kwright@cs.berkeley.edu> 1.2.1-1