This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: PR libgcj/17715
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 29 Sep 2004 13:48:07 -0600
- Subject: Patch: FYI: PR libgcj/17715
- Reply-to: tromey at redhat dot com
I'm checking this in. This fixes PR 17715. It is sort of horrible,
don't look too closely.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
PR libgcj/17715:
* Makefile.in: Rebuilt.
* Makefile.am (libgcj-@gcc_version@.jar): Include properties
files.
(all_property_files): New macro.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.418
diff -u -r1.418 Makefile.am
--- Makefile.am 29 Sep 2004 18:31:54 -0000 1.418
+++ Makefile.am 29 Sep 2004 19:49:19 -0000
@@ -469,6 +469,9 @@
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 @@
@: $(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 @@
.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