From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3451 invoked by alias); 14 May 2008 18:13:45 -0000 Received: (qmail 3165 invoked by uid 367); 14 May 2008 18:13:43 -0000 Date: Wed, 14 May 2008 18:13:00 -0000 Message-ID: <20080514181343.3150.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Rename frysk/jnixx to jnixx (to match its shorter C++ name). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5f5ad9c629bb9f8301878f47278bf5b816ab3fe3 X-Git-Newrev: ec63b3e38b56882b668db5ce52ff8cb39963b90e 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/msg00241.txt.bz2 The branch, master has been updated via ec63b3e38b56882b668db5ce52ff8cb39963b90e (commit) from 5f5ad9c629bb9f8301878f47278bf5b816ab3fe3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit ec63b3e38b56882b668db5ce52ff8cb39963b90e Author: Andrew Cagney Date: Wed May 14 14:11:29 2008 -0400 Rename frysk/jnixx to jnixx (to match its shorter C++ name). frysk-common/ChangeLog 2008-05-14 Andrew Cagney * Makefile.gen.sh (jnixx_sources): Rename frysk.jnixx to jnixx. Only install jni.hxx.gch if the compile worked. frysk-sys/ChangeLog 2008-05-14 Andrew Cagney * bootstrap.sh (FILE_LIST): Add jnixx. frysk-sys/frysk/sys/ChangeLog 2008-05-14 Andrew Cagney * jni/Fork.cxx: Update #includes for jnixx rename. * jni/Signal.cxx-sh: Ditto. * jni/PseudoTerminal.cxx: Ditto. frysk-sys/frysk/sys/proc/ChangeLog 2008-05-14 Andrew Cagney * jni/ProcBuilder.cxx: Update #includes to match jnixx rename. frysk-sys/frysk/sys/ptrace/ChangeLog 2008-05-14 Andrew Cagney * jni/AddressSpace.cxx: Update #includes to match jnixx rename. * jni/RegisterSet.cxx: Ditto. * jni/Ptrace.cxx: Ditto. frysk-sys/frysk/testbed/ChangeLog 2008-05-14 Andrew Cagney * jni/LocalMemory.cxx: Update #includes to match jnixx rename. frysk-sys/jnixx/ChangeLog 2008-05-14 Andrew Cagney Rename directory to jnixx/. * Main.java: Generate new include path. * elements.hxx, elements.cxx: rename chars.hxx, and chars.cxx. * cni/Native.cxx: Update. * logging.cxx: Update. * exceptions.cxx: Update. * print.cxx: Update. * jni/Native.cxx: Update. * xx.cxx: Delete. * xx.hxx: Delete. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 5 + frysk-common/Makefile.gen.sh | 7 +- frysk-sys/ChangeLog | 2 + frysk-sys/bootstrap.sh | 1 + frysk-sys/frysk/jnixx/xx.cxx | 154 -------------------- frysk-sys/frysk/jnixx/xx.hxx | 85 ----------- frysk-sys/frysk/sys/ChangeLog | 4 + frysk-sys/frysk/sys/jni/Fork.cxx | 4 +- frysk-sys/frysk/sys/jni/PseudoTerminal.cxx | 2 +- frysk-sys/frysk/sys/jni/Signal.cxx-sh | 2 +- frysk-sys/frysk/sys/proc/ChangeLog | 4 + frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx | 4 +- frysk-sys/frysk/sys/ptrace/ChangeLog | 5 + frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx | 4 +- frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx | 2 +- frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx | 4 +- frysk-sys/frysk/testbed/ChangeLog | 2 + frysk-sys/frysk/testbed/jni/LocalMemory.cxx | 2 +- frysk-sys/{frysk => }/jnixx/ChangeLog | 11 ++ frysk-sys/{frysk => }/jnixx/ClassVisitor.java | 2 +- frysk-sys/{frysk => }/jnixx/ClassWalker.java | 2 +- frysk-sys/{frysk => }/jnixx/JniBindings.java | 2 +- frysk-sys/{frysk => }/jnixx/Main.java | 4 +- frysk-sys/{frysk => }/jnixx/Native.java | 2 +- .../{frysk => }/jnixx/PrintCxxDefinitions.java | 2 +- frysk-sys/{frysk => }/jnixx/PrintDeclarations.java | 2 +- .../{frysk => }/jnixx/PrintHxxDefinitions.java | 2 +- frysk-sys/{frysk => }/jnixx/PrintNamespaces.java | 2 +- frysk-sys/{frysk => }/jnixx/Printer.java | 2 +- frysk-sys/{frysk => }/jnixx/TestJnixx.java | 2 +- frysk-sys/{frysk => }/jnixx/bounds.hxx | 0 frysk-sys/{frysk => }/jnixx/cni/Native.cxx | 14 +- .../{frysk/jnixx/chars.cxx => jnixx/elements.cxx} | 3 +- .../{frysk/jnixx/chars.hxx => jnixx/elements.hxx} | 0 frysk-sys/{frysk => }/jnixx/exceptions.cxx | 2 +- frysk-sys/{frysk => }/jnixx/exceptions.hxx | 0 frysk-sys/{frysk => }/jnixx/jni/Native.cxx | 16 +- frysk-sys/{frysk => }/jnixx/jnixx.hxx | 0 frysk-sys/{frysk => }/jnixx/logging.cxx | 4 +- frysk-sys/{frysk => }/jnixx/logging.hxx | 0 frysk-sys/{frysk => }/jnixx/print.cxx | 4 +- frysk-sys/{frysk => }/jnixx/print.hxx | 0 42 files changed, 84 insertions(+), 287 deletions(-) delete mode 100644 frysk-sys/frysk/jnixx/xx.cxx delete mode 100644 frysk-sys/frysk/jnixx/xx.hxx rename frysk-sys/{frysk => }/jnixx/ChangeLog (96%) rename frysk-sys/{frysk => }/jnixx/ClassVisitor.java (99%) rename frysk-sys/{frysk => }/jnixx/ClassWalker.java (99%) rename frysk-sys/{frysk => }/jnixx/JniBindings.java (99%) rename frysk-sys/{frysk => }/jnixx/Main.java (99%) rename frysk-sys/{frysk => }/jnixx/Native.java (99%) rename frysk-sys/{frysk => }/jnixx/PrintCxxDefinitions.java (99%) rename frysk-sys/{frysk => }/jnixx/PrintDeclarations.java (99%) rename frysk-sys/{frysk => }/jnixx/PrintHxxDefinitions.java (99%) rename frysk-sys/{frysk => }/jnixx/PrintNamespaces.java (99%) rename frysk-sys/{frysk => }/jnixx/Printer.java (99%) rename frysk-sys/{frysk => }/jnixx/TestJnixx.java (99%) rename frysk-sys/{frysk => }/jnixx/bounds.hxx (100%) rename frysk-sys/{frysk => }/jnixx/cni/Native.cxx (89%) rename frysk-sys/{frysk/jnixx/chars.cxx => jnixx/elements.cxx} (99%) rename frysk-sys/{frysk/jnixx/chars.hxx => jnixx/elements.hxx} (100%) rename frysk-sys/{frysk => }/jnixx/exceptions.cxx (98%) rename frysk-sys/{frysk => }/jnixx/exceptions.hxx (100%) rename frysk-sys/{frysk => }/jnixx/jni/Native.cxx (86%) rename frysk-sys/{frysk => }/jnixx/jnixx.hxx (100%) rename frysk-sys/{frysk => }/jnixx/logging.cxx (97%) rename frysk-sys/{frysk => }/jnixx/logging.hxx (100%) rename frysk-sys/{frysk => }/jnixx/print.cxx (97%) rename frysk-sys/{frysk => }/jnixx/print.hxx (100%) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 4aa7176..a05f0e2 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,3 +1,8 @@ +2008-05-14 Andrew Cagney + + * Makefile.gen.sh (jnixx_sources): Rename frysk.jnixx to jnixx. + Only install jni.hxx.gch if the compile worked. + 2008-05-13 Andrew Cagney * Makefile.gen.sh (JNIXX_CLASSES): Define. diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh index 05c9859..5c05f8f 100755 --- a/frysk-common/Makefile.gen.sh +++ b/frysk-common/Makefile.gen.sh @@ -902,16 +902,17 @@ CLEANFILES += jni.hxx jni.cxx jni.hxx.gch \$(lib${GEN_MAKENAME}_jni_a_SOURCES): | jni.hxx jni.hxx.gch jni.hxx: \$(jnixx_sources) | ${GEN_DIRNAME}.jar CLASSPATH=\$(GEN_DIRNAME).jar:\$(CLASSPATH) \\ - \$(JAVA) frysk.jnixx.Main \\ + \$(JAVA) jnixx.Main \\ hxx \\ jni.hxx ${GEN_DIRNAME}.jar \$(JNIXX_CLASSES) \\ > \$@.tmp mv \$@.tmp \$@ jni.hxx.gch: jni.hxx - \$(CXXCOMPILE) -c -x c++-header jni.hxx + \$(CXXCOMPILE) -c -x c++-header jni.hxx -o \$@.tmp + mv \$@.tmp \$@ jni.cxx: \$(jnixx_sources) | ${GEN_DIRNAME}.jar CLASSPATH=\$(GEN_DIRNAME).jar:\$(CLASSPATH) \\ - \$(JAVA) frysk.jnixx.Main \\ + \$(JAVA) jnixx.Main \\ cxx \\ jni.hxx ${GEN_DIRNAME}.jar \$(JNIXX_CLASSES) \\ > \$@.tmp diff --git a/frysk-sys/ChangeLog b/frysk-sys/ChangeLog index 7fdfce7..bc789ee 100644 --- a/frysk-sys/ChangeLog +++ b/frysk-sys/ChangeLog @@ -1,5 +1,7 @@ 2008-05-14 Andrew Cagney + * bootstrap.sh (FILE_LIST): Add jnixx. + * Makefile.am (JNIXX_CLASSES): Add java.lang.ArrayIndexOutOfBoundsException. diff --git a/frysk-sys/bootstrap.sh b/frysk-sys/bootstrap.sh index 699c915..0bbf4d7 100755 --- a/frysk-sys/bootstrap.sh +++ b/frysk-sys/bootstrap.sh @@ -41,6 +41,7 @@ set -e FILE_LIST="frysk \ + jnixx \ inua \ lib" diff --git a/frysk-sys/frysk/jnixx/xx.cxx b/frysk-sys/frysk/jnixx/xx.cxx deleted file mode 100644 index f5fd527..0000000 --- a/frysk-sys/frysk/jnixx/xx.cxx +++ /dev/null @@ -1,154 +0,0 @@ -// This file is part of the program FRYSK. -// -// Copyright 2008, Red Hat Inc. -// -// FRYSK is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// FRYSK is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with FRYSK; if not, write to the Free Software Foundation, -// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -// -// In addition, as a special exception, Red Hat, Inc. gives You the -// additional right to link the code of FRYSK with code not covered -// under the GNU General Public License ("Non-GPL Code") and to -// distribute linked combinations including the two, subject to the -// limitations in this paragraph. Non-GPL Code permitted under this -// exception must only link to the code of FRYSK through those well -// defined interfaces identified in the file named EXCEPTION found in -// the source code files (the "Approved Interfaces"). The files of -// Non-GPL Code may instantiate templates or use macros or inline -// functions from the Approved Interfaces without causing the -// resulting work to be covered by the GNU General Public -// License. Only Red Hat, Inc. may make changes or additions to the -// list of Approved Interfaces. You must obey the GNU General Public -// License in all respects for all of the FRYSK code and other code -// used in conjunction with FRYSK except the Non-GPL Code covered by -// this exception. If you modify this file, you may extend this -// exception to your version of the file, but you are not obligated to -// do so. If you do not wish to provide this exception without -// modification, you must delete this exception statement from your -// version and license this file solely under the GPL without -// exception. - -#include "frysk/jnixx/xx.hxx" - -jclass -findClass(JNIEnv* env, const char *signature) { - jclass klass = env->FindClass(signature); - if (klass == NULL) { - throw jnixx_exception(); - } - return klass; -} - -jstring -newStringUTF(JNIEnv* env, const char *string) { - jstring utf = env->NewStringUTF(string); - if (utf == NULL) { - throw jnixx_exception(); - } - return utf; -} - -jmethodID -getMethodID(JNIEnv* env, jobject object, const char* name, - const char* signature) { - jclass klass = env->GetObjectClass(object); - if (klass == NULL) { - fprintf(stderr, "frysk: failed to find class for method %s%s\n", - name, signature); - throw jnixx_exception(); - } - return getMethodID(env, klass, name, signature); -} - -jmethodID -getMethodID(JNIEnv* env, jclass klass, const char* name, - const char* signature) { - jmethodID methodID = env->GetMethodID(klass, name, signature); - if (methodID == NULL) { - fprintf(stderr, "frysk: failed to find method %s%s\n", - name, signature); - throw jnixx_exception(); - } - return methodID; -} - -jmethodID -getStaticMethodID(JNIEnv* env, jobject object, const char* name, - const char* signature) { - jclass klass = env->GetObjectClass(object); - if (klass == NULL) { - fprintf(stderr, "frysk: failed to find class for method %s%s\n", - name, signature); - throw jnixx_exception(); - } - return getStaticMethodID(env, klass, name, signature); -} - -jmethodID -getStaticMethodID(JNIEnv* env, jclass klass, const char* name, - const char* signature) { - jmethodID methodID = env->GetStaticMethodID(klass, name, signature); - if (methodID == NULL) { - fprintf(stderr, "frysk: failed to find method %s%s\n", - name, signature); - throw jnixx_exception(); - } - return methodID; -} - -jfieldID -getFieldID(JNIEnv* env, jobject object, const char* name, - const char* signature) { - jclass klass = env->GetObjectClass(object); - if (klass == NULL) { - fprintf(stderr, "frysk: failed to find class for field %s%s\n", - name, signature); - throw jnixx_exception(); - } - return getFieldID(env, klass, name, signature); -} - -jfieldID -getFieldID(JNIEnv* env, jclass klass, const char* name, - const char* signature) { - jfieldID fieldID = env->GetFieldID(klass, name, signature); - if (fieldID == NULL) { - fprintf(stderr, "frysk: failed to find field %s%s\n", - name, signature); - throw jnixx_exception(); - } - return fieldID; -} - -jfieldID -getStaticFieldID(JNIEnv* env, jobject object, const char* name, - const char* signature) { - jclass klass = env->GetObjectClass(object); - if (klass == NULL) { - fprintf(stderr, "frysk: failed to find class for field %s%s\n", - name, signature); - throw jnixx_exception(); - } - return getStaticFieldID(env, klass, name, signature); -} - -jfieldID -getStaticFieldID(JNIEnv* env, jclass klass, const char* name, - const char* signature) { - jfieldID fieldID = env->GetStaticFieldID(klass, name, signature); - if (fieldID == NULL) { - fprintf(stderr, "frysk: failed to find static field %s%s\n", - name, signature); - throw jnixx_exception(); - } - return fieldID; -} diff --git a/frysk-sys/frysk/jnixx/xx.hxx b/frysk-sys/frysk/jnixx/xx.hxx deleted file mode 100644 index 0bd3bff..0000000 --- a/frysk-sys/frysk/jnixx/xx.hxx +++ /dev/null @@ -1,85 +0,0 @@ -// This file is part of the program FRYSK. -// -// Copyright 2008, Red Hat Inc. -// -// FRYSK is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// FRYSK is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with FRYSK; if not, write to the Free Software Foundation, -// Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -// -// In addition, as a special exception, Red Hat, Inc. gives You the -// additional right to link the code of FRYSK with code not covered -// under the GNU General Public License ("Non-GPL Code") and to -// distribute linked combinations including the two, subject to the -// limitations in this paragraph. Non-GPL Code permitted under this -// exception must only link to the code of FRYSK through those well -// defined interfaces identified in the file named EXCEPTION found in -// the source code files (the "Approved Interfaces"). The files of -// Non-GPL Code may instantiate templates or use macros or inline -// functions from the Approved Interfaces without causing the -// resulting work to be covered by the GNU General Public -// License. Only Red Hat, Inc. may make changes or additions to the -// list of Approved Interfaces. You must obey the GNU General Public -// License in all respects for all of the FRYSK code and other code -// used in conjunction with FRYSK except the Non-GPL Code covered by -// this exception. If you modify this file, you may extend this -// exception to your version of the file, but you are not obligated to -// do so. If you do not wish to provide this exception without -// modification, you must delete this exception statement from your -// version and license this file solely under the GPL without -// exception. - -/** - * These methods either return the requested ID; or print a message to - * stderr and then throws a jnixx_exception. - */ - -#ifndef frysk_jni_xx_hxx -#define frysk_jni_xx_hxx - -#include - -class jnixx_exception { -}; - -struct __jstringArray : public __jobjectArray { -}; -typedef __jstringArray* jstringArray; - -extern jclass findClass(JNIEnv* env, const char *signature); - -extern jstring newStringUTF(JNIEnv* env, const char *string); - -extern jmethodID getMethodID(JNIEnv* env, jobject object, - const char* name, const char* signature); - -extern jmethodID getMethodID(JNIEnv* env, jclass klass, - const char* name, const char* signature); - -extern jfieldID getFieldID(JNIEnv* env, jobject object, - const char* name, const char* signature); - -extern jfieldID getFieldID(JNIEnv* env, jclass klass, - const char* name, const char* signature); - -extern jmethodID getStaticMethodID(JNIEnv* env, jobject object, - const char* name, const char* signature); - -extern jmethodID getStaticMethodID(JNIEnv* env, jclass klass, - const char* name, const char* signature); - -extern jfieldID getStaticFieldID(JNIEnv* env, jobject object, - const char* name, const char* signature); - -extern jfieldID getStaticFieldID(JNIEnv* env, jclass klass, - const char* name, const char* signature); - -#endif diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog index aaa782a..e51e955 100644 --- a/frysk-sys/frysk/sys/ChangeLog +++ b/frysk-sys/frysk/sys/ChangeLog @@ -1,5 +1,9 @@ 2008-05-14 Andrew Cagney + * jni/Fork.cxx: Update #includes for jnixx rename. + * jni/Signal.cxx-sh: Ditto. + * jni/PseudoTerminal.cxx: Ditto. + * jni/Fork.cxx (spawn): Use JNI names. 2008-05-13 Andrew Cagney diff --git a/frysk-sys/frysk/sys/jni/Fork.cxx b/frysk-sys/frysk/sys/jni/Fork.cxx index 4b8a42f..9a4e5f2 100644 --- a/frysk-sys/frysk/sys/jni/Fork.cxx +++ b/frysk-sys/frysk/sys/jni/Fork.cxx @@ -46,8 +46,8 @@ #include -#include "frysk/jnixx/chars.hxx" -#include "frysk/jnixx/exceptions.hxx" +#include "jnixx/elements.hxx" +#include "jnixx/exceptions.hxx" using namespace java::lang; diff --git a/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx b/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx index 04b36d2..2ae7e72 100644 --- a/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx +++ b/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx @@ -42,7 +42,7 @@ #include "jni.hxx" -#include "frysk/jnixx/exceptions.hxx" +#include "jnixx/exceptions.hxx" using namespace java::lang; diff --git a/frysk-sys/frysk/sys/jni/Signal.cxx-sh b/frysk-sys/frysk/sys/jni/Signal.cxx-sh index 62a38ce..869b301 100644 --- a/frysk-sys/frysk/sys/jni/Signal.cxx-sh +++ b/frysk-sys/frysk/sys/jni/Signal.cxx-sh @@ -49,7 +49,7 @@ cat < + + * jni/ProcBuilder.cxx: Update #includes to match jnixx rename. + 2008-05-13 Andrew Cagney * jni/ProcBuilder.cxx (ProcBuilder::construct): Pass env to build(). diff --git a/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx b/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx index 2808367..866dfd1 100644 --- a/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx +++ b/frysk-sys/frysk/sys/proc/jni/ProcBuilder.cxx @@ -44,8 +44,8 @@ #include "jni.hxx" -#include "frysk/jnixx/exceptions.hxx" -#include "frysk/jnixx/logging.hxx" +#include "jnixx/exceptions.hxx" +#include "jnixx/logging.hxx" void frysk::sys::proc::ProcBuilder::construct(::jnixx::env env, jint pid, diff --git a/frysk-sys/frysk/sys/ptrace/ChangeLog b/frysk-sys/frysk/sys/ptrace/ChangeLog index 3fa5f68..e0a70e8 100644 --- a/frysk-sys/frysk/sys/ptrace/ChangeLog +++ b/frysk-sys/frysk/sys/ptrace/ChangeLog @@ -1,7 +1,12 @@ 2008-05-14 Andrew Cagney + * jni/AddressSpace.cxx: Update #includes to match jnixx rename. + * jni/RegisterSet.cxx: Ditto. + * jni/Ptrace.cxx: Ditto. + * jni/Ptrace.cxx: Convert to JNI. * jni/AddressSpace.cxx: Convert to JNI. + * jni/RegisterSet.cxx: Covert to JNI. * jni/Utrace.cxx: Delete. diff --git a/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx b/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx index 4177164..09e9865 100644 --- a/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx +++ b/frysk-sys/frysk/sys/ptrace/jni/AddressSpace.cxx @@ -44,8 +44,8 @@ #include #include "jni.hxx" -#include "frysk/jnixx/bounds.hxx" -#include "frysk/jnixx/chars.hxx" +#include "jnixx/bounds.hxx" +#include "jnixx/elements.hxx" #include "frysk/sys/ptrace/jni/Ptrace.hxx" diff --git a/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx b/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx index d6726ed..1a7c13f 100644 --- a/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx +++ b/frysk-sys/frysk/sys/ptrace/jni/Ptrace.cxx @@ -45,7 +45,7 @@ #include "frysk/sys/ptrace/jni/Ptrace.hxx" -#include "frysk/jnixx/exceptions.hxx" +#include "jnixx/exceptions.hxx" static const char* op_as_string(int op) { diff --git a/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx b/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx index d44b1df..9bff9d9 100644 --- a/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx +++ b/frysk-sys/frysk/sys/ptrace/jni/RegisterSet.cxx @@ -46,8 +46,8 @@ #include "jni.hxx" #include "frysk/sys/ptrace/jni/Ptrace.hxx" -#include "frysk/jnixx/chars.hxx" -#include "frysk/jnixx/bounds.hxx" +#include "jnixx/elements.hxx" +#include "jnixx/bounds.hxx" void frysk::sys::ptrace::RegisterSet::transfer(::jnixx::env env, diff --git a/frysk-sys/frysk/testbed/ChangeLog b/frysk-sys/frysk/testbed/ChangeLog index bb4ebdb..587259c 100644 --- a/frysk-sys/frysk/testbed/ChangeLog +++ b/frysk-sys/frysk/testbed/ChangeLog @@ -1,5 +1,7 @@ 2008-05-14 Andrew Cagney + * jni/LocalMemory.cxx: Update #includes to match jnixx rename. + * jni/LocalMemory.cxx (getBytes): Use JNI names. 2008-05-12 Andrew Cagney diff --git a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx index 68b64e9..4512ca3 100644 --- a/frysk-sys/frysk/testbed/jni/LocalMemory.cxx +++ b/frysk-sys/frysk/testbed/jni/LocalMemory.cxx @@ -42,7 +42,7 @@ #include #include "jni.hxx" -#include "frysk/jnixx/exceptions.hxx" +#include "jnixx/exceptions.hxx" using namespace java::lang; diff --git a/frysk-sys/frysk/jnixx/ChangeLog b/frysk-sys/jnixx/ChangeLog similarity index 96% rename from frysk-sys/frysk/jnixx/ChangeLog rename to frysk-sys/jnixx/ChangeLog index deaf968..3b324ea 100644 --- a/frysk-sys/frysk/jnixx/ChangeLog +++ b/frysk-sys/jnixx/ChangeLog @@ -1,5 +1,16 @@ 2008-05-14 Andrew Cagney + Rename directory to jnixx/. + * Main.java: Generate new include path. + * elements.hxx, elements.cxx: rename chars.hxx, and chars.cxx. + * cni/Native.cxx: Update. + * logging.cxx: Update. + * exceptions.cxx: Update. + * print.cxx: Update. + * jni/Native.cxx: Update. + * xx.cxx: Delete. + * xx.hxx: Delete. hooks/post-receive -- frysk system monitor/debugger