Re: [cp-patches] [Patch] distcheck fixes for generate-locale-list.sh and LocaleData.java

[Mark Wielaard]

Hi,
On Mon, 2004-12-20 at 14:50 +0100, Michael Koch wrote:
> I just commited the attached patch to actually include
> generate-locale-list.sh in the dist tarball and to do some other
> distribution related fixes.

I made a couple of tweaks to how and where LocaleData.java is generated
as discussed on irc. And I made some changes to make it all compile
again with gcj on a system with "just" 250MB.
(Another reason to switch to a properties based approach.)

2004-12-23  Mark Wielaard  <address@hidden>

        * lib/Makefile.am (compile_classpath): New variable.
        Use when compiling with either jikes or gcj.
        (LocaleData.java): New rules.
        (genclasses): Depend on new rule.
        (CLEANFILES): Add LocaleData.java classes.locale1 and classes.locale2.
        (dist-hook): Remove generated LocaleData.java file.
        * lib/gen-classlist.sh.in: Add extra split files for locales.
        * lib/.cvsignore: Add classes.locale1 and classes.locale2.

The new rule for LocaleData.java in the Makefile is to prevent
regenerating it and triggering a complete new recompile during make
install (since it was unconditionally generated by genclasses before).

Committed,

Mark

Index: lib/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/.cvsignore,v
retrieving revision 1.14
diff -u -r1.14 .cvsignore
--- lib/.cvsignore      21 Dec 2004 19:56:54 -0000      1.14
+++ lib/.cvsignore      23 Dec 2004 18:26:55 -0000
@@ -7,6 +7,8 @@
 kaffe
 classes
 classes.awt
+classes.locale1
+classes.locale2
 classes.standard
 classes.standardx
 glibj.zip
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.73
diff -u -r1.73 Makefile.am
--- lib/Makefile.am     20 Dec 2004 13:47:16 -0000      1.73
+++ lib/Makefile.am     23 Dec 2004 18:26:55 -0000
@@ -16,14 +16,18 @@
 propertydirs :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org 
-type d ! -name CVS -print)
 propertyfiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org 
-name \*\.properties -print)
 
+compile_classpath = $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB)
+
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ
-JAVAC = $(GCJ) --bootclasspath '' --classpath 
$(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . 
@classes.standard \
-&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath 
$(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . 
@classes.awt \
-&& $(GCJ) -Wno-deprecated --bootclasspath '' --classpath 
$(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . 
@classes.standardx
+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.standardx
 else
 if FOUND_JIKES
-JAVAC = $(JIKES) +Pno-shadow +F -bootclasspath '' -extdirs '' -sourcepath '' 
--classpath $(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -d . 
@classes
+JAVAC = $(JIKES) +Pno-shadow +F -bootclasspath '' -extdirs '' -sourcepath '' 
--classpath $(compile_classpath) -d . @classes
 else
 if FOUND_KJC
 JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
@@ -78,9 +82,11 @@
 
 classes: genclasses
 
-genclasses: gen-classlist.sh standard.omit
-       mkdir -p java/util
-       $(top_srcdir)/scripts/generate-locale-list.sh > 
java/util/LocaleData.java
+$(top_builddir)/java/util/LocaleData.java: 
$(top_srcdir)/scripts/generate-locale-list.sh 
+       mkdir -p $(top_builddir)/java/util
+       $(top_srcdir)/scripts/generate-locale-list.sh > 
$(top_builddir)/java/util/LocaleData.java
+
+genclasses: gen-classlist.sh standard.omit 
$(top_builddir)/java/util/LocaleData.java
        top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard
 
 $(JAVA_DEPEND): genclasses
@@ -91,7 +97,9 @@
 
 EXTRA_DIST = standard.omit mkcollections.pl.in
 CLEANFILES = compile-classes resources classes \
-       classes.standard classes.awt classes.standardx glibj.zip classes.1 \
+       classes.standard classes.awt classes.standardx \
+       classes.locale1 classes.locale2 glibj.zip classes.1 \
+       $(top_builddir)/java/util/LocaleData.java \
        $(JAVA_DEPEND)
 
 clean-local:
@@ -108,6 +116,7 @@
        $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax 
$(top_distdir)/org $(top_distdir)/vm -name .cvsignore -print | xargs rm -f
        $(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax 
$(top_distdir)/org $(top_distdir)/vm -name class-dependencies.conf -print | 
xargs rm -f
        rm -f $(top_distdir)/gnu/classpath/Configuration.java
+       rm -f $(top_distdir)/java/util/LocaleData.java
 # Omit files listed in standard.omit.
        ( cd $(top_distdir)/lib ; cat $(top_builddir)/lib/standard.omit | sed 
-e 's/\$$//' | sed -e 's/\/\.\*//' | xargs rm -fr )
 
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.17
diff -u -r1.17 gen-classlist.sh.in
--- lib/gen-classlist.sh.in     20 Dec 2004 13:47:17 -0000      1.17
+++ lib/gen-classlist.sh.in     23 Dec 2004 18:26:55 -0000
@@ -28,7 +28,11 @@
 fi
 
 # Split in multiple parts for gcj
-grep -v /javax/ classes | grep -v /awt/ | grep -v /beans/ > classes.standard
+grep -v /javax/ classes | grep -v /awt/ \
+                        | grep -v /beans/ \
+                        | grep -v /locale/ > 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 /javax/ classes > classes.standardx

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