[cp-patches] FYI: Remove ugly locale compile workaround

[Mark Wielaard]

Hi,

With the new LocaleInformation sources the following isn't needed
anymore.

2005-01-05  Mark Wielaard  <address@hidden>

        * lib/gen-classlist.sh.in: Don't split locales in classes.locale1
        and classes.locale2.
        * lib/Makefile.am (JAVAC): Compile only classes.locale.
        (CLEANFILES): Remove classes.locale1 and classes.locale2,
        add classes.locale.

Tested on a machine with limited memory using gcj 3.3.4.

Committed,

Mark

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.77
diff -u -r1.77 Makefile.am
--- lib/Makefile.am     2 Jan 2005 20:08:50 -0000       1.77
+++ lib/Makefile.am     5 Jan 2005 22:53:37 -0000
@@ -14,8 +14,7 @@
 if FOUND_GCJ
 JAVAC = $(GCJ) --bootclasspath '' --classpath $(compile_classpath) -C -d . 
@classes.standard \
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) 
-C -d . @classes.awt \
-&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) 
-C -d . @classes.locale1 \
-&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) 
-C -d . @classes.locale2 \
+&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) 
-C -d . @classes.locale \
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) 
-C -d . @classes.xml \
 && $(GCJ) -Wno-deprecated --bootclasspath '' --classpath $(compile_classpath) 
-C -d . @classes.standardx
 else
@@ -110,7 +109,7 @@
 EXTRA_DIST = standard.omit mkcollections.pl.in
 CLEANFILES = compile-classes resources classes \
        classes.standard classes.awt classes.standardx classes.xml \
-       classes.locale1 classes.locale2 glibj.zip classes.1 \
+       classes.locale glibj.zip classes.1 \
        $(top_builddir)/java/util/LocaleData.java \
        $(JAVA_DEPEND)

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.20
diff -u -r1.20 gen-classlist.sh.in
--- lib/gen-classlist.sh.in     2 Jan 2005 15:06:25 -0000       1.20
+++ lib/gen-classlist.sh.in     5 Jan 2005 22:53:37 -0000
@@ -42,7 +42,6 @@
                        | grep -v /xml/ > classes.standard
 grep /awt/ classes > classes.awt
 grep /beans/ classes >> classes.awt
-grep /locale/ classes | grep _[j-z][a-z].java > classes.locale1
-grep /locale/ classes | grep -v _[j-z][a-z].java > classes.locale2
+grep /locale/ classes > classes.locale
 grep /xml/ classes > classes.xml
 grep /javax/ classes | grep -v /xml/ > classes.standardx

signature.asc
Description: This is a digitally signed message part