From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11361 invoked by alias); 14 May 2008 18:27:57 -0000 Received: (qmail 11336 invoked by uid 367); 14 May 2008 18:27:56 -0000 Date: Wed, 14 May 2008 18:27:00 -0000 Message-ID: <20080514182756.11321.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Test/fix link-error when calling jnixx runtime code. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ec63b3e38b56882b668db5ce52ff8cb39963b90e X-Git-Newrev: 413f3ae9d3d325c5b50c2245bf6bbbcc24883a89 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00242.txt.bz2 The branch, master has been updated via 413f3ae9d3d325c5b50c2245bf6bbbcc24883a89 (commit) from ec63b3e38b56882b668db5ce52ff8cb39963b90e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 413f3ae9d3d325c5b50c2245bf6bbbcc24883a89 Author: Andrew Cagney Date: Wed May 14 14:26:09 2008 -0400 Test/fix link-error when calling jnixx runtime code. frysk-common/ChangeLog 2008-05-14 Andrew Cagney * Makefile.gen.sh: Match jnixx/*.cxx. frysk-sys/ChangeLog 2008-05-14 Andrew Cagney * Makefile.am (JniRunner): Rename frysk.jnixx to jnixx. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 2 ++ frysk-common/Makefile.gen.sh | 2 +- frysk-sys/ChangeLog | 2 ++ frysk-sys/Makefile.am | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index a05f0e2..0064a02 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,7 @@ 2008-05-14 Andrew Cagney + * Makefile.gen.sh: Match jnixx/*.cxx. + * Makefile.gen.sh (jnixx_sources): Rename frysk.jnixx to jnixx. Only install jni.hxx.gch if the compile worked. diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh index 5c05f8f..b59a71c 100755 --- a/frysk-common/Makefile.gen.sh +++ b/frysk-common/Makefile.gen.sh @@ -870,7 +870,7 @@ while read file dir base suffix ; do generate_cni_header $file $dir $base $suffix generate_compile $file $dir $base $suffix ${sources} ;; - */jni/*.cxx | */jni/*.cxx-in | */jni/*.cxx-sh | */jnixx/*.cxx ) + */jni/*.cxx | */jni/*.cxx-in | */jni/*.cxx-sh | jnixx/*.cxx ) generate_jnixx_class $file $dir $base $suffix generate_compile $file $dir $base $suffix \ lib${GEN_MAKENAME}_jni_a_SOURCES diff --git a/frysk-sys/ChangeLog b/frysk-sys/ChangeLog index bc789ee..ef44d4b 100644 --- a/frysk-sys/ChangeLog +++ b/frysk-sys/ChangeLog @@ -1,5 +1,7 @@ 2008-05-14 Andrew Cagney + * Makefile.am (JniRunner): Rename frysk.jnixx to jnixx. + * bootstrap.sh (FILE_LIST): Add jnixx. * Makefile.am (JNIXX_CLASSES): Add diff --git a/frysk-sys/Makefile.am b/frysk-sys/Makefile.am index cd10704..12b9399 100644 --- a/frysk-sys/Makefile.am +++ b/frysk-sys/Makefile.am @@ -95,7 +95,7 @@ JniRunner: | frysk-sys.jar libfrysk-sys-jni.so echo " frysk.rsl \\" >> $@.tmp echo " frysk.junit \\" >> $@.tmp echo " frysk.config \\" >> $@.tmp - echo " frysk.jnixx \\" >> $@.tmp + echo " jnixx \\" >> $@.tmp echo " inua \\" >> $@.tmp echo " ;" >> $@.tmp echo "else" >> $@.tmp hooks/post-receive -- frysk system monitor/debugger