Re: [cp-patches] RFC: qt4 peers build machinery

[Mark Wielaard]

Hi,

On Tue, 2005-08-16 at 23:26 +0200, Dalibor Topic wrote:
> the attached patch adds the necessary build machinery for Qt 4 peers.

Thanks! Still trying to get a clean build environment. But you will at
least need a little update to the check_jni_methods.sh script. Attached.

Cheers,

Mark

Index: scripts/check_jni_methods.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/scripts/check_jni_methods.sh,v
retrieving revision 1.8
diff -u -r1.8 check_jni_methods.sh
--- scripts/check_jni_methods.sh        13 Aug 2005 18:00:14 -0000      1.8
+++ scripts/check_jni_methods.sh        16 Aug 2005 23:10:47 -0000
@@ -18,8 +18,19 @@
 # Find all methods in the JNI C source files.
 find native/jni -name \*.c | \
        xargs grep -h '^Java_' | \
-        LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' | \
-       sort > $TMPFILE2
+        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 | \
+       xargs grep -h '^Java_' | \
+        LC_ALL=C sed -e 's,^\(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
+find 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
+sort $TMPFILE3 > $TMPFILE2
+rm $TMPFILE3
 
 # Write temporary ignore file.
 cat > $TMPFILE3 << EOF

signature.asc
Description: This is a digitally signed message part