diff options
| author | Dalibor Topic <robilad@yahoo.com> | 2008-02-09 21:16:16 +0000 |
|---|---|---|
| committer | Dalibor Topic <robilad@yahoo.com> | 2008-02-09 21:16:16 +0000 |
| commit | a972611c0bc6514fe48fd8467e84766adfc2b725 (patch) | |
| tree | 172fdd24eb6cdfd7bba9f94e840bf05ae1617794 /scripts | |
| parent | d7305c7400c3a4dda07a2a539563f52f392f375d (diff) | |
| download | classpath-a972611c0bc6514fe48fd8467e84766adfc2b725.tar.gz | |
2008-02-09 Dalibor Topic <robilad@kaffe.org>
* native/jni/Makefile.am (all-local): Call check_jni_methods.sh
directly.
* scripts/Makefile.am (EXTRA_DIST): Removed check_jni_methods.sh.
* include/Makefile.am (SOUND_H_FILES, GST_PEER_H_FILES)
(XMLJ_H_FILES, GTKPEER_H_FILES, QTPEER_H_FILES)
(GCONF_PREFS_FILES, H_FILES): Don't generate header files
in the source directory, as it may not be writeable.
(DISTCLEANFILES) Added H_FILES.
* configure.ac (AC_CONFIG_FILES): Added
scripts/check_jni_methods.sh.
* scripts/check_jni_methods.sh: Removed. Moved over to ..
* scripts/check_jni_methods.sh.in: New file. Added
top_srcdir and top_builddir where necessary.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/check_jni_methods.sh.in (renamed from scripts/check_jni_methods.sh) | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 433784018..9d80ba067 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST = check_jni_methods.sh generate-locale-list.sh import-cacerts.sh +EXTRA_DIST = generate-locale-list.sh import-cacerts.sh diff --git a/scripts/check_jni_methods.sh b/scripts/check_jni_methods.sh.in index 90a7735ba..b9bc7e7d8 100755..100644 --- a/scripts/check_jni_methods.sh +++ b/scripts/check_jni_methods.sh.in @@ -9,20 +9,20 @@ TMPFILE3=/tmp/check-jni-methods.$$.3 # Find all methods defined in the header files generated # from the java source files. -grep -h '^JNIEXPORT .* Java_' include/*.h | \ +grep -h '^JNIEXPORT .* Java_' @top_builddir@/include/*.h | \ LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \ sort > $TMPFILE # Find all methods in the JNI C source files. -find native/jni -name \*.c | \ +find @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 native/jni -name \*.cpp | \ +find @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 native/jni -name \*.cpp | \ +find @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 |