summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2008-02-10 11:08:22 +0000
committerMark Wielaard <mark@klomp.org>2008-02-10 11:08:22 +0000
commit8aaeb37d19101acb78a77fb8c35047a0f9e6be4b (patch)
treedac120d1bc1ec2862bcd19738040e0e59546e41d
parent8e2153ffecf0185b077de30455e47a0c75c2f87f (diff)
downloadclasspath-8aaeb37d19101acb78a77fb8c35047a0f9e6be4b.tar.gz
* scripts/check_jni_methods.sh.in:
Use abs_src_builddir so that the absolute path to the source directory is used by the script.
-rw-r--r--ChangeLog6
-rw-r--r--scripts/check_jni_methods.sh.in6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bfc3dd44..107188640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-10 Mark Wielaard <mark@klomp.org>
+
+ * scripts/check_jni_methods.sh.in:
+ Use abs_src_builddir so that the absolute path
+ to the source directory is used by the script.
+
2008-02-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
* scripts/check_jni_methods.sh.in:
diff --git a/scripts/check_jni_methods.sh.in b/scripts/check_jni_methods.sh.in
index d23f11d94..73cd1fc6a 100644
--- a/scripts/check_jni_methods.sh.in
+++ b/scripts/check_jni_methods.sh.in
@@ -14,15 +14,15 @@ grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \
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