From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5506 invoked by alias); 2 May 2008 15:04:43 -0000 Received: (qmail 5480 invoked by uid 367); 2 May 2008 15:04:42 -0000 Date: Fri, 02 May 2008 15:04:00 -0000 Message-ID: <20080502150442.5465.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Rename frysk.jni frysk.jnixx. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bd4079f3265adffbd81e8fc1a8d2dd0314cd27b1 X-Git-Newrev: 2ae9dc714bf916136b370e5778104cf1d76b19da 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/msg00179.txt.bz2 The branch, master has been updated via 2ae9dc714bf916136b370e5778104cf1d76b19da (commit) from bd4079f3265adffbd81e8fc1a8d2dd0314cd27b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 2ae9dc714bf916136b370e5778104cf1d76b19da Author: Andrew Cagney Date: Fri May 2 11:02:56 2008 -0400 Rename frysk.jni frysk.jnixx. frysk-common/ChangeLog 2008-05-02 Andrew Cagney * Makefile.rules (JNIXX): Update; frysk.jni renamed to frysk.jnixx. frysk-sys/frysk/jnixx/ChangeLog 2008-05-02 Andrew Cagney * Rename directory to frysk/jnixx/ frysk-sys/frysk/rsl/ChangeLog 2008-05-02 Andrew Cagney * jni/Log.cxx: Update; frysk.jni renamed to frysk.jnixx. frysk-sys/frysk/sys/ChangeLog 2008-05-02 Andrew Cagney * jni/PseudoTerminal.cxx: Ditto. * jni/Signal.cxx-sh: Update; frysk.jni renamed to frysk.jnixx. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 5 +++++ frysk-common/Makefile.rules | 2 +- frysk-sys/frysk/{jni => jnixx}/ChangeLog | 2 ++ frysk-sys/frysk/{jni => jnixx}/exceptions.cxx | 4 ++-- frysk-sys/frysk/{jni => jnixx}/exceptions.hxx | 0 frysk-sys/frysk/{jni => jnixx}/jnixx.java | 6 ++---- frysk-sys/frysk/{jni => jnixx}/print.cxx | 2 +- frysk-sys/frysk/{jni => jnixx}/print.hxx | 0 frysk-sys/frysk/{jni => jnixx}/xx.cxx | 2 +- frysk-sys/frysk/{jni => jnixx}/xx.hxx | 0 frysk-sys/frysk/rsl/ChangeLog | 4 ++++ frysk-sys/frysk/rsl/jni/Log.cxx | 4 ++-- frysk-sys/frysk/sys/ChangeLog | 5 +++++ frysk-sys/frysk/sys/jni/PseudoTerminal.cxx | 2 +- frysk-sys/frysk/sys/jni/Signal.cxx-sh | 2 +- 15 files changed, 27 insertions(+), 13 deletions(-) rename frysk-sys/frysk/{jni => jnixx}/ChangeLog (96%) rename frysk-sys/frysk/{jni => jnixx}/exceptions.cxx (97%) rename frysk-sys/frysk/{jni => jnixx}/exceptions.hxx (100%) rename frysk-sys/frysk/{jni => jnixx}/jnixx.java (99%) rename frysk-sys/frysk/{jni => jnixx}/print.cxx (98%) rename frysk-sys/frysk/{jni => jnixx}/print.hxx (100%) rename frysk-sys/frysk/{jni => jnixx}/xx.cxx (99%) rename frysk-sys/frysk/{jni => jnixx}/xx.hxx (100%) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index e4d9368..84ebce5 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,3 +1,8 @@ +2008-05-02 Andrew Cagney + + * Makefile.rules (JNIXX): Update; frysk.jni renamed to + frysk.jnixx. + 2008-04-30 Andrew Cagney * Makefile.gen.sh (generate_jnixx_sources): New. diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules index 4f4aad1..224c4ad 100644 --- a/frysk-common/Makefile.rules +++ b/frysk-common/Makefile.rules @@ -402,7 +402,7 @@ JNIXX = \ echo "$$class $$suffix => $@" ; \ rm -f $@.tmp ; \ CLASSPATH=$(GEN_DIRNAME).jar:$(CLASSPATH) \ - $(JAVA) frysk.jni.jnixx $$class $$suffix \ + $(JAVA) frysk.jnixx.jnixx $$class $$suffix \ > $@.tmp ; \ mv $@.tmp $@ %-jni.hxx: %.java diff --git a/frysk-sys/frysk/jni/ChangeLog b/frysk-sys/frysk/jnixx/ChangeLog similarity index 96% rename from frysk-sys/frysk/jni/ChangeLog rename to frysk-sys/frysk/jnixx/ChangeLog index 15faadd..cc35afb 100644 --- a/frysk-sys/frysk/jni/ChangeLog +++ b/frysk-sys/frysk/jnixx/ChangeLog @@ -1,5 +1,7 @@ 2008-05-02 Andrew Cagney + * Rename directory to frysk/jnixx/ + * jnixx.java: Generate constructors and field accessors. 2008-05-01 Andrew Cagney diff --git a/frysk-sys/frysk/jni/exceptions.cxx b/frysk-sys/frysk/jnixx/exceptions.cxx similarity index 97% rename from frysk-sys/frysk/jni/exceptions.cxx rename to frysk-sys/frysk/jnixx/exceptions.cxx index 29862ba..ef52e98 100644 --- a/frysk-sys/frysk/jni/exceptions.cxx +++ b/frysk-sys/frysk/jnixx/exceptions.cxx @@ -45,8 +45,8 @@ #include -#include "frysk/jni/xx.hxx" -#include "frysk/jni/exceptions.hxx" +#include "frysk/jnixx/xx.hxx" +#include "frysk/jnixx/exceptions.hxx" void errnoException(JNIEnv *env, int error, const char *prefix) { diff --git a/frysk-sys/frysk/jni/exceptions.hxx b/frysk-sys/frysk/jnixx/exceptions.hxx similarity index 100% rename from frysk-sys/frysk/jni/exceptions.hxx rename to frysk-sys/frysk/jnixx/exceptions.hxx diff --git a/frysk-sys/frysk/jni/jnixx.java b/frysk-sys/frysk/jnixx/jnixx.java similarity index 99% rename from frysk-sys/frysk/jni/jnixx.java rename to frysk-sys/frysk/jnixx/jnixx.java index 8ddd247..2157c86 100644 --- a/frysk-sys/frysk/jni/jnixx.java +++ b/frysk-sys/frysk/jnixx/jnixx.java @@ -37,7 +37,7 @@ // version and license this file solely under the GPL without // exception. -package frysk.jni; +package frysk.jnixx; import java.lang.reflect.Member; import java.lang.reflect.Field; @@ -629,7 +629,7 @@ class jnixx { println("#ifndef " + header); println("#define " + header); println(); - println("#include \"frysk/jni/xx.hxx\""); + println("#include \"frysk/jnixx/xx.hxx\""); printCxxNamespaces(klass); println(); Class parent = klass.getSuperclass(); @@ -678,8 +678,6 @@ class jnixx { } static void printCxxFile(Class klass) { - println("#include \"frysk/jni/xx.hxx\""); - println(); print("#include \""); print(klass.getName().replaceAll("\\.", "/")); print("-jni.hxx\""); diff --git a/frysk-sys/frysk/jni/print.cxx b/frysk-sys/frysk/jnixx/print.cxx similarity index 98% rename from frysk-sys/frysk/jni/print.cxx rename to frysk-sys/frysk/jnixx/print.cxx index 9567166..543a5bf 100644 --- a/frysk-sys/frysk/jni/print.cxx +++ b/frysk-sys/frysk/jnixx/print.cxx @@ -40,7 +40,7 @@ #include #include -#include "frysk/jni/print.hxx" +#include "frysk/jnixx/print.hxx" /** * Do printf style printing to a java String. diff --git a/frysk-sys/frysk/jni/print.hxx b/frysk-sys/frysk/jnixx/print.hxx similarity index 100% rename from frysk-sys/frysk/jni/print.hxx rename to frysk-sys/frysk/jnixx/print.hxx diff --git a/frysk-sys/frysk/jni/xx.cxx b/frysk-sys/frysk/jnixx/xx.cxx similarity index 99% rename from frysk-sys/frysk/jni/xx.cxx rename to frysk-sys/frysk/jnixx/xx.cxx index fec56e0..f5fd527 100644 --- a/frysk-sys/frysk/jni/xx.cxx +++ b/frysk-sys/frysk/jnixx/xx.cxx @@ -37,7 +37,7 @@ // version and license this file solely under the GPL without // exception. -#include "frysk/jni/xx.hxx" +#include "frysk/jnixx/xx.hxx" jclass findClass(JNIEnv* env, const char *signature) { diff --git a/frysk-sys/frysk/jni/xx.hxx b/frysk-sys/frysk/jnixx/xx.hxx similarity index 100% rename from frysk-sys/frysk/jni/xx.hxx rename to frysk-sys/frysk/jnixx/xx.hxx diff --git a/frysk-sys/frysk/rsl/ChangeLog b/frysk-sys/frysk/rsl/ChangeLog index 3dd5bb3..68f7be3 100644 --- a/frysk-sys/frysk/rsl/ChangeLog +++ b/frysk-sys/frysk/rsl/ChangeLog @@ -1,3 +1,7 @@ +2008-05-02 Andrew Cagney + + * jni/Log.cxx: Update; frysk.jni renamed to frysk.jnixx. + 2008-05-01 Andrew Cagney * jni/Log.cxx: Re-implement using jnixx generated stubs. diff --git a/frysk-sys/frysk/rsl/jni/Log.cxx b/frysk-sys/frysk/rsl/jni/Log.cxx index 635c7ac..25a2191 100644 --- a/frysk-sys/frysk/rsl/jni/Log.cxx +++ b/frysk-sys/frysk/rsl/jni/Log.cxx @@ -40,10 +40,10 @@ #include #include -#include "frysk/jni/xx.hxx" +#include "frysk/jnixx/xx.hxx" #include "frysk/rsl/Log-jni.hxx" -#include "frysk/jni/print.hxx" +#include "frysk/jnixx/print.hxx" #include "frysk/rsl/jni/Log.hxx" void diff --git a/frysk-sys/frysk/sys/ChangeLog b/frysk-sys/frysk/sys/ChangeLog index f5e88b3..bbfb494 100644 --- a/frysk-sys/frysk/sys/ChangeLog +++ b/frysk-sys/frysk/sys/ChangeLog @@ -1,3 +1,8 @@ +2008-05-02 Andrew Cagney + + * jni/PseudoTerminal.cxx: Ditto. + * jni/Signal.cxx-sh: Update; frysk.jni renamed to frysk.jnixx. + 2008-05-01 Andrew Cagney * jni/PseudoTerminal.cxx (PseudoTerminal::getName): Implement. diff --git a/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx b/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx index 58306f9..c8a6388 100644 --- a/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx +++ b/frysk-sys/frysk/sys/jni/PseudoTerminal.cxx @@ -42,7 +42,7 @@ #include "frysk/sys/PseudoTerminal-jni.hxx" -#include "frysk/jni/exceptions.hxx" +#include "frysk/jnixx/exceptions.hxx" jstring frysk::sys::PseudoTerminal::getName(JNIEnv* env, jint pty) { diff --git a/frysk-sys/frysk/sys/jni/Signal.cxx-sh b/frysk-sys/frysk/sys/jni/Signal.cxx-sh index 03cdc83..fa5ca6d 100644 --- a/frysk-sys/frysk/sys/jni/Signal.cxx-sh +++ b/frysk-sys/frysk/sys/jni/Signal.cxx-sh @@ -49,7 +49,7 @@ cat <