[kaffe] CVS kaffe (robilad): Switched over to cp-tools native2ascii

Kaffe CVS cvs-commits at kaffe.org
Thu Mar 3 11:20:11 PST 2005


PatchSet 5494 
Date: 2005/03/03 19:15:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Switched over to cp-tools native2ascii

Members: 
	ChangeLog:1.3668->1.3669 
	kaffe/scripts/native2ascii.in:1.5->1.6 
	libraries/javalib/Makefile.am:1.316->1.317 
	libraries/javalib/Makefile.in:1.402->1.403 
	libraries/javalib/all.files:1.96->1.97 
	libraries/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java:INITIAL->1.1 
	libraries/javalib/kaffe/tools/native2ascii/Native2ASCII.java:1.2->1.3(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3668 kaffe/ChangeLog:1.3669
--- kaffe/ChangeLog:1.3668	Thu Mar  3 18:55:47 2005
+++ kaffe/ChangeLog	Thu Mar  3 19:15:44 2005
@@ -1,5 +1,21 @@
 2005-03-03  Dalibor Topic  <robilad at kaffe.org>
 
+        * kaffe/scripts/native2ascii.in: 
+	Use gnu.classpath.tools.native2ascii.Native2Ascii.
+
+        * libraries/javalib/Makefile.am,
+        libraries/javalib/Makefile.in,
+        libraries/javalib/all.files:
+	Regenerated.
+
+        * libraries/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java:
+	New file taken from GNU Classpath tools project.
+
+        * libraries/javalib/kaffe/tools/native2ascii/Native2ASCII.java:
+	Removed.
+
+2005-03-03  Dalibor Topic  <robilad at kaffe.org>
+
         * THIRDPARTY: Added gnu.bytecode and cp-tools javap.
 
         * developers/gdbinit (pStr): fixed field name.
Index: kaffe/kaffe/scripts/native2ascii.in
diff -u kaffe/kaffe/scripts/native2ascii.in:1.5 kaffe/kaffe/scripts/native2ascii.in:1.6
--- kaffe/kaffe/scripts/native2ascii.in:1.5	Fri May 21 14:39:32 2004
+++ kaffe/kaffe/scripts/native2ascii.in	Thu Mar  3 19:15:47 2005
@@ -1,6 +1,6 @@
 #! /bin/sh
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS kaffe.tools.native2ascii.Native2ASCII ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.native2ascii.Native2ASCII ${1+"$@"}
 exit $?
 
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.316 kaffe/libraries/javalib/Makefile.am:1.317
--- kaffe/libraries/javalib/Makefile.am:1.316	Thu Mar  3 18:55:52 2005
+++ kaffe/libraries/javalib/Makefile.am	Thu Mar  3 19:15:47 2005
@@ -55,6 +55,7 @@
 	$(gnu_classpath_SRCS) \
 	$(gnu_classpath_tools_SRCS) \
 	$(gnu_classpath_tools_javap_SRCS) \
+	$(gnu_classpath_tools_native2ascii_SRCS) \
 	$(gnu_crypto_SRCS) \
 	$(gnu_crypto_assembly_SRCS) \
 	$(gnu_crypto_auth_SRCS) \
@@ -281,7 +282,6 @@
 	$(kaffe_security_SRCS) \
 	$(kaffe_security_provider_SRCS) \
 	$(kaffe_tools_jar_SRCS) \
-	$(kaffe_tools_native2ascii_SRCS) \
 	$(kaffe_tools_serialver_SRCS) \
 	$(kaffe_util_SRCS) \
 	$(kaffe_util_locale_SRCS) \
@@ -401,6 +401,8 @@
 	gnu/classpath/tools/javap/GnuByteCodeJavap.java \
 	gnu/classpath/tools/javap/Javap.java \
 	gnu/classpath/tools/javap/JavapMain.java
+gnu_classpath_tools_native2ascii_SRCS = \
+	gnu/classpath/tools/native2ascii/Native2ASCII.java
 gnu_crypto_SRCS = \
 	gnu/crypto/Properties.java \
 	gnu/crypto/Registry.java
@@ -4097,8 +4099,6 @@
 	kaffe/tools/jar/XPFileOutputStream.java \
 	kaffe/tools/jar/XPFileReader.java \
 	kaffe/tools/jar/XPFileWriter.java
-kaffe_tools_native2ascii_SRCS = \
-	kaffe/tools/native2ascii/Native2ASCII.java
 kaffe_tools_serialver_SRCS = \
 	kaffe/tools/serialver/SerialVer.java
 kaffe_util_SRCS = \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.402 kaffe/libraries/javalib/Makefile.in:1.403
--- kaffe/libraries/javalib/Makefile.in:1.402	Thu Mar  3 18:55:53 2005
+++ kaffe/libraries/javalib/Makefile.in	Thu Mar  3 19:15:48 2005
@@ -407,6 +407,7 @@
 	$(gnu_classpath_SRCS) \
 	$(gnu_classpath_tools_SRCS) \
 	$(gnu_classpath_tools_javap_SRCS) \
+	$(gnu_classpath_tools_native2ascii_SRCS) \
 	$(gnu_crypto_SRCS) \
 	$(gnu_crypto_assembly_SRCS) \
 	$(gnu_crypto_auth_SRCS) \
@@ -633,7 +634,6 @@
 	$(kaffe_security_SRCS) \
 	$(kaffe_security_provider_SRCS) \
 	$(kaffe_tools_jar_SRCS) \
-	$(kaffe_tools_native2ascii_SRCS) \
 	$(kaffe_tools_serialver_SRCS) \
 	$(kaffe_util_SRCS) \
 	$(kaffe_util_locale_SRCS) \
@@ -759,6 +759,9 @@
 	gnu/classpath/tools/javap/Javap.java \
 	gnu/classpath/tools/javap/JavapMain.java
 
+gnu_classpath_tools_native2ascii_SRCS = \
+	gnu/classpath/tools/native2ascii/Native2ASCII.java
+
 gnu_crypto_SRCS = \
 	gnu/crypto/Properties.java \
 	gnu/crypto/Registry.java
@@ -4680,9 +4683,6 @@
 	kaffe/tools/jar/XPFileOutputStream.java \
 	kaffe/tools/jar/XPFileReader.java \
 	kaffe/tools/jar/XPFileWriter.java
-
-kaffe_tools_native2ascii_SRCS = \
-	kaffe/tools/native2ascii/Native2ASCII.java
 
 kaffe_tools_serialver_SRCS = \
 	kaffe/tools/serialver/SerialVer.java
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.96 kaffe/libraries/javalib/all.files:1.97
--- kaffe/libraries/javalib/all.files:1.96	Thu Mar  3 18:55:56 2005
+++ kaffe/libraries/javalib/all.files	Thu Mar  3 19:15:49 2005
@@ -66,6 +66,7 @@
 gnu/classpath/tools/javap/GnuByteCodeJavap.java
 gnu/classpath/tools/javap/Javap.java
 gnu/classpath/tools/javap/JavapMain.java
+gnu/classpath/tools/native2ascii/Native2ASCII.java
 gnu/crypto/Properties.java
 gnu/crypto/Registry.java
 gnu/crypto/assembly/Assembly.java
@@ -3536,7 +3537,6 @@
 kaffe/tools/jar/XPFileOutputStream.java
 kaffe/tools/jar/XPFileReader.java
 kaffe/tools/jar/XPFileWriter.java
-kaffe/tools/native2ascii/Native2ASCII.java
 kaffe/tools/serialver/SerialVer.java
 kaffe/util/Assert.java
 kaffe/util/Base64.java
===================================================================
Checking out kaffe/libraries/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java	Thu Mar  3 19:20:11 2005
@@ -0,0 +1,104 @@
+/*
+ * Java core library component.
+ * 
+ * Copyright (c) 2003 Ito Kazumitsu <kaz at maczuka.gcd.org>. All rights reserved.
+ * 
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file.
+ */
+package gnu.classpath.tools.native2ascii;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
+public class Native2ASCII
+{
+  public static void main(String[] args)
+  {
+    String encoding = System.getProperty("file.encoding");
+    String input = null;
+    String output = null;
+    for (int i = 0; i < args.length; i++)
+      {
+        if (args[i].equals("-encoding"))
+          {
+            i++;
+            if (i >= args.length)
+              {
+                System.err.println("encoding is missing");
+              }
+            else
+              {
+                encoding = args[i];
+              }
+          }
+        else if (args[i].equals("-reverse") || args[i].startsWith("-J"))
+          {
+            System.err.println(args[i] + ": not supported");
+          }
+        else
+          {
+            if (input == null)
+              {
+                input = args[i];
+              }
+            else if (output == null)
+              {
+                output = args[i];
+              }
+            else
+              {
+                System.err.println(args[i] + ": ignored");
+              }
+          }
+      }
+    try
+      {
+        InputStream is = (input == null ? System.in
+            : new FileInputStream(input));
+        OutputStream os = (output == null ? (OutputStream) System.out
+            : new FileOutputStream(output));
+        BufferedReader rdr = new BufferedReader(new InputStreamReader(is,
+                                                                      encoding));
+        PrintWriter wtr = new PrintWriter(
+                                          new BufferedWriter(
+                                                             new OutputStreamWriter(
+                                                                                    os,
+                                                                                    encoding)));
+        while (true)
+          {
+            String s = rdr.readLine();
+            if (s == null)
+              break;
+            StringBuffer sb = new StringBuffer(s.length() + 80);
+            for (int i = 0; i < s.length(); i++)
+              {
+                char c = s.charAt(i);
+                if (c <= 0xff)
+                  {
+                    sb.append(c);
+                  }
+                else
+                  {
+                    sb.append("\\u" + Integer.toHexString((int) c));
+                  }
+              }
+            wtr.println(sb.toString());
+          }
+        rdr.close();
+        wtr.flush();
+        wtr.close();
+      }
+    catch (Exception e)
+      {
+        e.printStackTrace();
+      }
+  }
+}
\ No newline at end of file
===================================================================
Checking out kaffe/libraries/javalib/kaffe/tools/native2ascii/Native2ASCII.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/kaffe/tools/native2ascii/Attic/Native2ASCII.java,v
VERS: 1.2
***************
--- kaffe/libraries/javalib/kaffe/tools/native2ascii/Native2ASCII.java	Thu Mar  3 19:20:11 2005
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,94 +0,0 @@
-/*
- * Java core library component.
- *
- * Copyright (c) 2003
- *      Ito Kazumitsu <kaz at maczuka.gcd.org>.  All rights reserved.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file.
- */
-
-
-package kaffe.tools.native2ascii;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-public class Native2ASCII {
-
-    public static void main(String[] args) {
-
-        String encoding = System.getProperty("file.encoding");
-        String input = null;
-        String output = null;
-
-        for (int i=0; i<args.length; i++) {
-            if(args[i].equals("-encoding")) {
-                i++;
-                if (i >= args.length) {
-                    System.err.println("encoding is missing");
-                }
-                else {
-                    encoding = args[i];
-                }
-            }
-            else if (args[i].equals("-reverse") || args[i].startsWith("-J")) {
-                System.err.println(args[i] + ": not supported");
-            }
-            else {
-                if (input == null) {
-                    input = args[i];
-                }
-                else if (output == null) {
-                    output = args[i];
-                }
-                else {
-                    System.err.println(args[i] + ": ignored");
-                }
-            }
-        }
-
-        try {
-            InputStream is = (input == null ?
-                System.in :
-                new FileInputStream(input));
-            OutputStream os = (output == null ?
-                (OutputStream)System.out :
-                new FileOutputStream(output));
-            BufferedReader rdr =
-                new BufferedReader(
-                    new InputStreamReader(is, encoding));
-            PrintWriter wtr =
-                new PrintWriter(
-                    new BufferedWriter(
-                        new OutputStreamWriter(os, encoding)));
-            while (true) {
-                String s = rdr.readLine();
-                if (s == null) break;
-                StringBuffer sb = new StringBuffer(s.length() + 80);
-                for (int i = 0; i < s.length(); i++) {
-                    char c = s.charAt(i);
-                    if (c <= 0xff) {
-                        sb.append(c);
-                    }
-                    else {
-                        sb.append("\\u" + Integer.toHexString((int)c));
-                    }
-                }
-                wtr.println(sb.toString());
-            }
-            rdr.close();
-            wtr.flush();
-            wtr.close();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}




More information about the kaffe mailing list