This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: Patch: merge Classpath regexp support
- From: Anthony Green <green at redhat dot com>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: java-patches at gcc dot gnu dot org
- Date: Tue, 09 Mar 2004 11:00:04 -0800
- Subject: Re: Patch: merge Classpath regexp support
- Organization: Red Hat, Inc.
- References: <1078830750.5144.12.camel@escape> <87fzchykbz.fsf@fleche.redhat.com>
Tom wrote:
> Why not just have a more ordinary rule?
>
> %.o: %.properties
> blah blah
To be honest, I borrowed the logic from Gary's work in rhug. It's
possible that we are forced to do this in rhug by libtool.
However, it seems as though the simpler approach does work with libgcj.
Here's a revised patch. Ok?
2004-03-08 Anthony Green <green@redhat.com>
* Makefile.am: Build property resource files into libgcj.
* Makefile.in: Rebuilt.
* java/util/regex/Matcher.java, java/util/regex/Pattern.java,
java/util/regex/PatternSyntaxException.java,
gnu/regexp/CharIndexed.java,
gnu/regexp/CharIndexedCharArray.java,
gnu/regexp/CharIndexedInputStream.java,
gnu/regexp/CharIndexedReader.java,
gnu/regexp/CharIndexedString.java,
gnu/regexp/CharIndexedStringBuffer.java, gnu/regexp/RE.java,
gnu/regexp/REException.java,
gnu/regexp/REFilterInputStream.java,
gnu/regexp/REFilterReader.java, gnu/regexp/REMatch.java,
gnu/regexp/REMatchEnumeration.java, gnu/regexp/RESyntax.java,
gnu/regexp/REToken.java, gnu/regexp/RETokenAny.java,
gnu/regexp/RETokenBackRef.java, gnu/regexp/RETokenChar.java,
gnu/regexp/RETokenEnd.java, gnu/regexp/RETokenEndSub.java,
gnu/regexp/RETokenLookAhead.java,
gnu/regexp/RETokenOneOf.java, gnu/regexp/RETokenPOSIX.java,
gnu/regexp/RETokenRange.java, gnu/regexp/RETokenRepeated.java,
gnu/regexp/RETokenStart.java,
gnu/regexp/RETokenWordBoundary.java,
gnu/regexp/UncheckedRE.java: Files merged from GNU Classpath.
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.364
diff -c -p -r1.364 Makefile.am
*** libjava/Makefile.am 3 Mar 2004 23:50:03 -0000 1.364
--- libjava/Makefile.am 9 Mar 2004 18:56:40 -0000
*************** EXTRA_libgcj_la_SOURCES = boehm.cc nogc.
*** 156,165 ****
$(extra_cc_source_files) $(java_source_files) $(built_java_source_files)
libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \
$(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \
! $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS)
libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \
! $(THREADOBJS) $(PLATFORMOBJS)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
--- 156,166 ----
$(extra_cc_source_files) $(java_source_files) $(built_java_source_files)
libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \
$(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \
! $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) \
! $(propertyo_files)
libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \
! $(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
*************** all_java_source_files = \
*** 374,379 ****
--- 375,390 ----
all_java_class_files = $(all_java_source_files:.java=.class)
+ ## Build property files into the library.
+ property_files = \
+ gnu/regexp/MessagesBundle.properties \
+ gnu/regexp/MessagesBundle_fr.properties
+
+ propertyo_files = $(property_files:.properties=.properties.lo)
+
+ %.properties.lo: %.properties
+ $(GCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
+
if ONESTEP
# Compile all classfiles in one go.
*************** distclean-local:
*** 433,439 ****
clean-nat:
rm -f $(nat_files) $(x_nat_files)
! SUFFIXES = .class .java .h
.class.lo:
$(GCJCOMPILE) -o $@ $<
--- 444,450 ----
clean-nat:
rm -f $(nat_files) $(x_nat_files)
! SUFFIXES = .class .java .h .properties
.class.lo:
$(GCJCOMPILE) -o $@ $<
*************** gnu/java/nio/charset/UTF_16Decoder.java
*** 2368,2373 ****
--- 2379,2411 ----
gnu/java/nio/charset/UTF_16Encoder.java \
gnu/java/nio/charset/UTF_16LE.java \
gnu/java/nio/charset/UTF_8.java \
+ gnu/regexp/CharIndexed.java \
+ gnu/regexp/CharIndexedCharArray.java \
+ gnu/regexp/CharIndexedInputStream.java \
+ gnu/regexp/CharIndexedReader.java \
+ gnu/regexp/CharIndexedString.java \
+ gnu/regexp/CharIndexedStringBuffer.java \
+ gnu/regexp/RE.java \
+ gnu/regexp/REException.java \
+ gnu/regexp/REFilterInputStream.java \
+ gnu/regexp/REFilterReader.java \
+ gnu/regexp/REMatch.java \
+ gnu/regexp/REMatchEnumeration.java \
+ gnu/regexp/RESyntax.java \
+ gnu/regexp/REToken.java \
+ gnu/regexp/RETokenAny.java \
+ gnu/regexp/RETokenBackRef.java \
+ gnu/regexp/RETokenChar.java \
+ gnu/regexp/RETokenEnd.java \
+ gnu/regexp/RETokenEndSub.java \
+ gnu/regexp/RETokenLookAhead.java \
+ gnu/regexp/RETokenOneOf.java \
+ gnu/regexp/RETokenPOSIX.java \
+ gnu/regexp/RETokenRange.java \
+ gnu/regexp/RETokenRepeated.java \
+ gnu/regexp/RETokenStart.java \
+ gnu/regexp/RETokenWordBoundary.java \
+ gnu/regexp/UncheckedRE.java \
gnu/java/security/Engine.java \
gnu/java/security/OID.java \
gnu/java/security/der/BitString.java \
AG
--
Anthony Green <green@redhat.com>
Red Hat, Inc.