Hi Andrew,
On Sun, 2008-02-10 at 03:01 +0000, Andrew John Hughes wrote:
> > * The script no longer works because it is run from native/jni but
> > looks for the include files in ../include (as the script was generated
> > with top_builddir being relative to scripts).
Thanks for fixing this. The attached patch also fixes the same issue
when using a relative srcdir (as was happening on builder).
2008-02-10 Mark Wielaard <[EMAIL PROTECTED]>
* scripts/check_jni_methods.sh.in:
Use abs_src_builddir so that the absolute path
to the source directory is used by the script.
Cheers,
Mark
Index: scripts/check_jni_methods.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/scripts/check_jni_methods.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- scripts/check_jni_methods.sh.in 10 Feb 2008 02:26:25 -0000 1.2
+++ scripts/check_jni_methods.sh.in 10 Feb 2008 11:08:23 -0000 1.3
@@ -14,15 +14,15 @@
sort > $TMPFILE
# Find all methods in the JNI C source files.
-find @top_srcdir@/native/jni -name \*.c | \
+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 @top_srcdir@/native/jni -name \*.cpp | \
+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 @top_srcdir@/native/jni -name \*.cpp | \
+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
