Re: PING: Re: RFC: [cp-patches] META-INF support

[Michael Koch]

On Mon, May 16, 2005 at 01:19:47PM +0100, Andrew John Hughes wrote:
> On Sun, 2005-04-17 at 15:34 +0100, Andrew John Hughes wrote:
> > On Mon, 2005-04-11 at 17:35 +0100, Andrew John Hughes wrote:
> > > On Mon, 2005-04-11 at 07:40 +0200, Michael Koch wrote:
> > > > On Mon, Apr 11, 2005 at 03:59:00AM +0100, Andrew John Hughes wrote:
> > > > 
> > > > > 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...
> > > > 
> > > > Would not work as java.lang.Object and some other VM important classes
> > > > are too different (currently).
> > > > 
> > > 
> > > Exactly; if we allow a jar name, I can see someone filing a PR for that
> > > problem.
> > > 
> > > > > 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
> > > > 
> > > > In a separate patch this would be obvious and already in I guess. ;-)
> > > > 
> > > 
> > > Yes, this is my bad; I did this a while ago and forgot to commit it (I
> > > only spotted this when testing the generics branch).  At least it's the
> > > same sort of file... ;)
> > > 
> > > > > 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)
> > > > 
> > > > How does $(top_srcdir)/resource/META-INF gets created? It's not in CVS.
> > > > 
> > > > 
> > > > Michael
> > > 
> > > Whoops... forgot to cvs add them.  My excuse is that I shouldn't do this
> > > late at night, and instead wait until morning.  My third attempt is
> > > attached, which includes the services file.
> > > 
> > > Talking of that dir, I'm unsure about the org.xml.sax.driver.  This is
> > > the only way it works for me, but it may be wrong.  Any comments on this
> > > (particularly from Chris) would be welcomed.
> > > 
> > > _______________________________________________
> > > Classpath-patches mailing list
> > > address@hidden
> > > http://lists.gnu.org/mailman/listinfo/classpath-patches
> > 
> > Any movement on this?
> > _______________________________________________
> > Classpath-patches mailing list
> > address@hidden
> > http://lists.gnu.org/mailman/listinfo/classpath-patches
> 
> Again, is it okay to commit this?

Okay. Sorry for the delay.


Michael
-- 
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html

Join the community at http://planet.classpath.org/