From 26aed92305eabb36c383c9178e01a3e0a7d1e830 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 29 Sep 2004 19:51:17 +0000 Subject: [PATCH] re PR libgcj/17715 (.properties files missing from libgcj-4.0.0.jar) PR libgcj/17715: * Makefile.in: Rebuilt. * Makefile.am (libgcj-@gcc_version@.jar): Include properties files. (all_property_files): New macro. From-SVN: r88300 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 31 ++++++++++++++++++++++++------- libjava/Makefile.in | 27 ++++++++++++++++++++------- 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e1d6f9f1554..f9ec6170336 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2004-09-29 Tom Tromey + PR libgcj/17715: + * Makefile.in: Rebuilt. + * Makefile.am (libgcj-@gcc_version@.jar): Include properties + files. + (all_property_files): New macro. + * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Re-sorted. (libgcj.la): Moved to old location near lib-gnu-awt-xlib.la. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 88554621be2..1e0e9c07870 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -469,6 +469,9 @@ all_java_source_files = \ all_java_class_files = $(all_java_source_files:.java=.class) +all_property_files = $(property_files) $(jgss_property_files) \ + java/util/logging/logging.properties + ## Build property files into the library. property_files = \ gnu/regexp/MessagesBundle.properties \ @@ -498,9 +501,16 @@ libgcj-@gcc_version@.jar: $(all_java_source_files) @: $(call write_entries_to_file,$?,libgcj.sourcelist) $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) @libgcj.sourcelist ## Note that we explicitly want to include directory information. - find java gnu javax org -type d -o -type f -name '*.class' | \ - sed -e '/\/\./d' -e '/\/xlib/d' | \ - $(ZIP) cfM0E@ $@ + (find java gnu javax org -type d -o -type f -name '*.class'; \ +## Ugly code to avoid "echo -C". Must separate each entry by a newline +## Gross but easy. + for file in $(all_property_files); do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir); \ + echo $$file; \ + done) | \ + sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \ + $(ZIP) -cfM0E@ $@ # This next rule seems backward, but reflects the fact # that 1) all classfiles are compiled in one go when the @@ -516,12 +526,19 @@ else # !ONESTEP .java.class: $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $< -libgcj-@gcc_version@.jar: $(all_java_class_files) +libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files) -@rm -f libgcj-@gcc_version@.jar ## Note that we explicitly want to include directory information. - find java gnu javax org -type d -o -type f -name '*.class' | \ - sed -e '/\/\./d' -e '/\/xlib/d' | \ - $(ZIP) cfM0E@ $@ + (find java gnu javax org -type d -o -type f -name '*.class'; \ +## Ugly code to avoid "echo -C". Must separate each entry by a newline +## Gross but easy. + for file in $(all_property_files); do \ + echo "x-C" | sed -e 's/^.//'; \ + echo $(srcdir); \ + echo $$file; \ + done) | \ + sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \ + $(ZIP) -cfM0E@ $@ endif diff --git a/libjava/Makefile.in b/libjava/Makefile.in index b07a404ab07..678acdcb493 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4671,6 +4671,9 @@ all_java_source_files = \ $(xlib_java_source_files) all_java_class_files = $(all_java_source_files:.java=.class) +all_property_files = $(property_files) $(jgss_property_files) \ + java/util/logging/logging.properties + property_files = \ gnu/regexp/MessagesBundle.properties \ gnu/regexp/MessagesBundle_fr.properties @@ -23159,9 +23162,14 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN @ONESTEP_TRUE@ @echo Compiling Java sourcefiles... @ONESTEP_TRUE@ @: $(call write_entries_to_file,$?,libgcj.sourcelist) @ONESTEP_TRUE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) @libgcj.sourcelist -@ONESTEP_TRUE@ find java gnu javax org -type d -o -type f -name '*.class' | \ -@ONESTEP_TRUE@ sed -e '/\/\./d' -e '/\/xlib/d' | \ -@ONESTEP_TRUE@ $(ZIP) cfM0E@ $@ +@ONESTEP_TRUE@ (find java gnu javax org -type d -o -type f -name '*.class'; \ +@ONESTEP_TRUE@ for file in $(all_property_files); do \ +@ONESTEP_TRUE@ echo "x-C" | sed -e 's/^.//'; \ +@ONESTEP_TRUE@ echo $(srcdir); \ +@ONESTEP_TRUE@ echo $$file; \ +@ONESTEP_TRUE@ done) | \ +@ONESTEP_TRUE@ sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \ +@ONESTEP_TRUE@ $(ZIP) -cfM0E@ $@ # This next rule seems backward, but reflects the fact # that 1) all classfiles are compiled in one go when the @@ -23175,11 +23183,16 @@ $(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDEN @ONESTEP_FALSE@.java.class: @ONESTEP_FALSE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $< -@ONESTEP_FALSE@libgcj-@gcc_version@.jar: $(all_java_class_files) +@ONESTEP_FALSE@libgcj-@gcc_version@.jar: $(all_java_class_files) $(all_property_files) @ONESTEP_FALSE@ -@rm -f libgcj-@gcc_version@.jar -@ONESTEP_FALSE@ find java gnu javax org -type d -o -type f -name '*.class' | \ -@ONESTEP_FALSE@ sed -e '/\/\./d' -e '/\/xlib/d' | \ -@ONESTEP_FALSE@ $(ZIP) cfM0E@ $@ +@ONESTEP_FALSE@ (find java gnu javax org -type d -o -type f -name '*.class'; \ +@ONESTEP_FALSE@ for file in $(all_property_files); do \ +@ONESTEP_FALSE@ echo "x-C" | sed -e 's/^.//'; \ +@ONESTEP_FALSE@ echo $(srcdir); \ +@ONESTEP_FALSE@ echo $$file; \ +@ONESTEP_FALSE@ done) | \ +@ONESTEP_FALSE@ sed -e '/\/xlib/d' -e '/\/\.libs/d' -e '/\/\.deps/d' | \ +@ONESTEP_FALSE@ $(ZIP) -cfM0E@ $@ mostlyclean-local: find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f