On Sun, 2005-04-10 at 08:18 +0200, Michael Koch wrote: > On Sun, Apr 10, 2005 at 03:42:39AM +0200, Robert Schuster wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > > Hash: SHA1 > > > > Hi, > > AFAIK we support not only delivery as glibj.zip but as glibj.jar and as > > a plain directory. The patch looks as if it only works for the zip-case. > > Are there any reasons to make this different for the other two variants? > > WE dont support glibj.jar for some reasons but you are right that we > support a plain directory tree. > > > Michael
Yes, you're spot on; sorry, it was my mistake in creating the patch (guess I'm too used to just using the zip method). Please find attached an updated version that should handle both. As to a jar version, we considered this recently on the list. One reason we call it glibj.zip is because it can't be used as a normal jar, and using a different file extension (which still fits the content, because jars, AFAIK, are just zips with defined metadata) helps differentiate it. I can foresee someone posting a GCJ bug when they try to use -findirect-dispatch on it... Thanks, -- Andrew :-) Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments. See http://www.fsf.org/philosophy/no-word-attachments.html No software patents in Europe -- http://nosoftwarepatents.com "Value your freedom, or you will lose it, teaches history. `Don't bother us with politics' respond those who don't want to learn." -- Richard Stallman Escape the Java Trap with GNU Classpath! http://www.gnu.org/philosophy/java-trap.html public class gcj extends Freedom implements Java { ... }
Index: examples/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/examples/Makefile.am,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 Makefile.am --- examples/Makefile.am 7 Feb 2005 02:32:37 -0000 1.3 +++ examples/Makefile.am 11 Apr 2005 02:49:55 -0000 @@ -11,7 +11,7 @@ if FOUND_GCJX JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:. else if FOUND_ECJ -JCOMPILER = $(ECJ) --bootclasspath '$(top_builddir)/lib' --classpath . +JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib' -classpath . else error dunno how to setup the JCOMPILER and compile endif Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v retrieving revision 1.79 diff -u -3 -p -u -r1.79 Makefile.am --- lib/Makefile.am 7 Feb 2005 02:32:37 -0000 1.79 +++ lib/Makefile.am 11 Apr 2005 02:50:04 -0000 @@ -53,6 +53,7 @@ install-data-local: genclasses compile-c cp -R java $(DESTDIR)$(pkgdatadir) cp -R javax $(DESTDIR)$(pkgdatadir) cp -R org $(DESTDIR)$(pkgdatadir) + cp -R META-INF $(DESTDIR)$(pkgdatadir) # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: @@ -60,13 +61,14 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/java rm -rf $(DESTDIR)$(pkgdatadir)/javax rm -rf $(DESTDIR)$(pkgdatadir)/org + rm -rf $(DESTDIR)$(pkgdatadir)/META-INF endif # INSTALL_CLASS_FILES .PHONY: genclasses glibj.zip: classes compile-classes resources - if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org > /dev/null; fi + if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi resources: if ! [ -e gnu ]; then mkdir gnu; fi @@ -78,6 +80,8 @@ resources: @list='$(propertyfiles)'; for p in $$list; do \ cp $(top_srcdir)/resource/$$p $$p; \ done + if [ -e META-INF ]; then rm -rf META-INF; fi + cp -r $(top_srcdir)/resource/META-INF . touch resources classes: genclasses @@ -122,6 +126,7 @@ clean-local: -rm -rf java -rm -rf javax -rm -rf org + -rm -rf META-INF dist-hook: mkdir -p $(distdir)
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
