From 714091c605a17a38c58e538316c532e1a1d067cc Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 16 Apr 1999 17:31:26 +0000 Subject: [PATCH] Makefile.am: Various changes for new files and conversions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit � * Makefile.am: Various changes for new files and conversions. From-SVN: r26505 --- libjava/ChangeLog | 24 +++++++++++++++++++++ libjava/Makefile.am | 51 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 92b21d11ed1..dbef79e21d5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,27 @@ +1999-04-16 Per Bothner + + * gnu/gcj/convert/JIS0201.h: New file, generated from Unicode table. + * gnu/gcj/convert/Input_JavaSrc.java: New BytesToUnicode class. + * gnu/gcj/convert/Input_SJIS.java: New BytesToUnicode class. + * gnu/gcj/convert/Output_EUCJIS.java: New UnicodeToBytes class. + * gnu/gcj/convert/Output_SJIS.java: New UnicodeToBytes class. + * gnu/gcj/convert/natInput_EUCJIS.cc: New file. + * gnu/gcj/convert/natInput_SJIS.cc: New file. + * gnu/gcj/convert/natOutput_EUCJIS.cc: New file. + * gnu/gcj/convert/natOutput_SJIS.cc: New file. + * gnu/gcj/convert/make-trie.c: New file: functions to make a trie. + * gnu/gcj/convert/gen-from-JIS.c: Invoke make-trie for output. + * gnu/gcj/convert/Unicode_to_JIS.cc: New generated trie table. + * Makefile.am: Various changes for new files and conversions. + + * gnu/gcj/convert/UnicodeToBytes.java (write(String,int,int,char[])): + New overloading, allows greater efficiency. + * gnu/gcj/convert/Output_8859_1.java (write(String,int,int,char[])): + New overloading (for efficiency - avoids copying). + + * gnu/gcj/convert/Output_UTF8.java: Fix typo: 0xC0 -> 0c3F. + * gnu/gcj/convert/Input_UTF8.java: Fix typos in bit masks. + 1999-04-15 Warren Levy * Makefile.am (ordinary_java_source_files): Added new Connection diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 9c1aca1f128..f796c37c5f3 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -254,38 +254,58 @@ jv_convert_LDADD = $(convert_source_files:.java=.o) -L. $(GCLIBS) $(THREADLIBS) jv_convert_DEPENDENCIES = $(convert_source_files:.java=.o) \ $(GCDEPS) $(THREADDEPS) libgcj.a +# The Unicode consortium does not permit re-distributing the file JIS0201.TXT. +# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. + +$(srcdir)/$(CONVERT_DIR)/JIS0201.h: # $(CONVERT_DIR)/JIS0201.TXT + echo '/* This file is automatically generated from Unicode tables */' > tmp-0201; \ + tr -d '\r' <$(CONVERT_DIR)/JIS0201.TXT \ + | sed -n -e 's|\(0x..\).*\(0x....\).*#\(.*\)$$|MAP(0x00, \1, \2) /*\3 */|p' \ + >> tmp-0201; \ + mv tmp-0201 $(srcdir)/$(CONVERT_DIR)/JIS0201.h + # The Unicode consortium does not permit re-distributing the file JIS0208.TXT. # You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. -$(srcdir)/$(CONVERT_DIR)/JIS0208.h: # JIS0208.TXT - echo '/* This file is autoamtically generated from Unicode tables */' > tmp-0208; \ - sed -n -e 's|\(0x....\).*0x\(..\)\(..\).*\(0x....\).*#\(.*\).$$|MAP(0x\2, 0x\3, \4) /*\5 */|p' \ - > tmp-0208; \ +$(srcdir)/$(CONVERT_DIR)/JIS0208.h: # $(CONVERT_DIR)/JIS0208.TXT + echo '/* This file is automatically generated from Unicode tables */' > tmp-0208; \ + tr -d '\r' <$(CONVERT_DIR)/JIS0208.TXT \ + | sed -n -e 's|\(0x....\).*0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\2, 0x\3, \4) /*\5 */|p' \ + >> tmp-0208; \ mv tmp-0208 $(srcdir)/$(CONVERT_DIR)/JIS0208.h # The Unicode consortium does not permit re-distributing the file JIS0212.TXT. # You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/. -$(srcdir)/$(CONVERT_DIR)/JIS0212.h: # JIS0212.TXT - echo '/* This file is autoamtically generated from Unicode tables */' > tmp-0212; \ - sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\).$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \ - > tmp-0212; \ +$(srcdir)/$(CONVERT_DIR)/JIS0212.h: # $(CONVERT_DIR)/JIS0212.TXT + echo '/* This file is automatically generated from Unicode tables */' > tmp-0212; \ + tr -d '\r' <$(CONVERT_DIR)/JIS0212.TXT \ + | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \ + >> tmp-0212; \ mv tmp-0212 $(srcdir)/$(CONVERT_DIR)/JIS0212.h gen_from_JIS_SOURCES = EXTRA_gen_from_JIS_SOURCES = $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \ + $(srcdir)/$(CONVERT_DIR)/make-trie.c \ + $(srcdir)/$(CONVERT_DIR)/JIS0201.h \ $(srcdir)/$(CONVERT_DIR)/JIS0208.h \ $(srcdir)/$(CONVERT_DIR)/JIS0212.h -gen_from_JIS_LDADD = $(CONVERT_DIR)/gen-from-JIS.o -gen_from_JIS_DEPENDENCIES = $(CONVERT_DIR)/gen-from-JIS.o +gen_from_JIS_LDADD = $(CONVERT_DIR)/gen-from-JIS.o $(CONVERT_DIR)/make-trie.o +gen_from_JIS_DEPENDENCIES = $(CONVERT_DIR)/gen-from-JIS.o \ + $(CONVERT_DIR)/make-trie.o $(CONVERT_DIR)/gen-from-JIS.o: $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \ + $(srcdir)/$(CONVERT_DIR)/JIS0201.h \ $(srcdir)/$(CONVERT_DIR)/JIS0208.h \ $(srcdir)/$(CONVERT_DIR)/JIS0212.h $(COMPILE) -c -o $(CONVERT_DIR)/gen-from-JIS.o \ $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c +$(CONVERT_DIR)/make-trie.o: $(srcdir)/$(CONVERT_DIR)/make-trie.c + $(COMPILE) -c -o $(CONVERT_DIR)/make-trie.o \ + $(srcdir)/$(CONVERT_DIR)/make-trie.c + if NATIVE if MAINTAINER_MODE @@ -295,6 +315,9 @@ $(srcdir)/$(CONVERT_DIR)/JIS0208_to_Unicode.cc: ./gen-from-JIS$(EXEEXT) $(srcdir)/$(CONVERT_DIR)/JIS0212_to_Unicode.cc: ./gen-from-JIS$(EXEEXT) ./gen-from-JIS JIS0212>$(srcdir)/$(CONVERT_DIR)/JIS0212_to_Unicode.cc +$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT) + ./gen-from-JIS toJIS>$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc + endif # MAINTAINER_MODE endif # NATIVE @@ -310,9 +333,13 @@ gnu/gcj/convert/BytesToUnicode.java \ gnu/gcj/convert/Convert.java \ gnu/gcj/convert/Input_8859_1.java \ gnu/gcj/convert/Input_EUCJIS.java \ +gnu/gcj/convert/Input_JavaSrc.java \ +gnu/gcj/convert/Input_SJIS.java \ gnu/gcj/convert/Input_UTF8.java \ gnu/gcj/convert/Output_8859_1.java \ +gnu/gcj/convert/Output_EUCJIS.java \ gnu/gcj/convert/Output_JavaSrc.java \ +gnu/gcj/convert/Output_SJIS.java \ gnu/gcj/convert/Output_UTF8.java \ gnu/gcj/convert/UnicodeToBytes.java @@ -569,7 +596,9 @@ java/util/natGregorianCalendar.cc java/lang/natFirstThread.cc \ java/lang/natCharacter.cc java/lang/natMath.cc java/lang/natFloat.cc \ java/lang/reflect/natField.cc java/net/natInetAddress.cc \ java/net/natPlainSocketImpl.cc java/lang/reflect/natMethod.cc \ -java/lang/reflect/natArray.cc gnu/gcj/convert/natInput_EUCJIS.cc \ +java/lang/reflect/natArray.cc gnu/gcj/convert/Unicode_to_JIS.cc \ +gnu/gcj/convert/natInput_EUCJIS.cc gnu/gcj/convert/natOutput_EUCJIS.cc \ +gnu/gcj/convert/natInput_SJIS.cc gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/convert/JIS0208_to_Unicode.cc \ gnu/gcj/convert/JIS0212_to_Unicode.cc