96f3dd0a66
When building under LANG=cs_CZ.UTF-8, the JNI method check fails: /bin/bash ../../scripts/check_jni_methods.sh Found a problem with the JNI methods declared and implemented. (<) missing in implementation, (>) missing in header files > Java_gnu_java_awt_peer_gtk_GtkClipboard_advertiseContent > Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState ... lots more ... While the sed commands are run under LC_ALL=C, the two sort commands are not, and they end up producing unexpected output (for the test). Once we run both under LC_ALL=C, the check passes. While we're here, we can also combine latter the `sort|uniq` into `sort -u` to match the earlier code. URL: https://bugs.gentoo.org/563710 Reported-by: Miroslav Šulc <fordfrog@gentoo.org> From-SVN: r229388
66 lines
2.1 KiB
Bash
66 lines
2.1 KiB
Bash
#!/bin/sh
|
|
|
|
# Fail if any command fails
|
|
set -e
|
|
|
|
TMPFILE=/tmp/check-jni-methods.$$.1
|
|
TMPFILE2=/tmp/check-jni-methods.$$.2
|
|
TMPFILE3=/tmp/check-jni-methods.$$.3
|
|
TMPFILE4=/tmp/check-jni-methods.$$.4
|
|
|
|
# Find all methods defined in the header files generated
|
|
# from the java source files.
|
|
grep -h '^JNIEXPORT .* Java_' @abs_top_srcdir@/include/*.h | \
|
|
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' > $TMPFILE
|
|
grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \
|
|
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE
|
|
LC_ALL=C sort -u $TMPFILE > $TMPFILE4
|
|
mv $TMPFILE4 $TMPFILE
|
|
|
|
# Find all methods in the JNI C source files.
|
|
find @abs_top_srcdir@/native/jni -name \*.c | \
|
|
xargs grep -h '^Java_' | \
|
|
LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\).*$,\1,' > $TMPFILE2
|
|
# Or in the the C++ files. (Note that cpp doesn't follow gnu conventions atm)
|
|
# So we try to match both GNU style and some other style.
|
|
find @abs_top_srcdir@/native/jni -name \*.cpp | \
|
|
xargs grep -h '^Java_' | \
|
|
LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2
|
|
find @abs_top_srcdir@/native/jni -name \*.cpp | \
|
|
xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \
|
|
cut -f4 -d\ | \
|
|
LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE2
|
|
mv $TMPFILE2 $TMPFILE3
|
|
LC_ALL=C sort -u $TMPFILE3 > $TMPFILE2
|
|
rm $TMPFILE3
|
|
|
|
# Write temporary ignore file.
|
|
cat > $TMPFILE3 << EOF
|
|
< Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose
|
|
< Java_java_lang_VMSystem_arraycopy
|
|
< Java_java_lang_VMSystem_identityHashCode
|
|
EOF
|
|
|
|
# Compare again silently.
|
|
# Use fgrep and direct the output to /dev/null for compatibility with older
|
|
# grep instead of using the non portable -q.
|
|
if diff $TMPFILE $TMPFILE2 | grep '^[<>] Java' | \
|
|
fgrep -v -f $TMPFILE3 > /dev/null;
|
|
then
|
|
PROBLEM=1
|
|
echo "Found a problem with the JNI methods declared and implemented."
|
|
echo "(<) missing in implementation, (>) missing in header files"
|
|
|
|
# Compare the found method lists.
|
|
diff $TMPFILE $TMPFILE2 | grep '^[<>] Java' | fgrep -v -f $TMPFILE3
|
|
fi
|
|
|
|
# Cleanup.
|
|
rm -f $TMPFILE $TMPFILE2 $TMPFILE3
|
|
|
|
if test "$PROBLEM" = "1" ; then
|
|
exit 1
|
|
fi
|
|
|
|
exit 0
|