Re: [cp-patches] META-INF support

[Robert Schuster]

-----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?

cu
Robert

Andrew John Hughes wrote:
> At present, the XML libraries are not aware of the parsers provided
> by the inclusion of GNU JAXP in GNU Classpath.  Indeed, further inspection
> by myself showed that there is no META-INF directory added to glibj.zip
> at all, let alone a services subdirectory.  The attached patch adds
> this.  Please give your comments on this; it is potentially useful
> for other things as well such as the imageIO framework.
> 
> It also fixes a minor problem with ecj support.
> 
> Changelog
> 
> 2005-04-10  Andrew John Hughes  <address@hidden>
> 
>       * examples/Makefile.am:
>       Fix command-line options for ecj.
>       * lib/Makefile.am:
>       Added a META-INF directory structure to glibj.zip.
> 
> 
> 
> ------------------------------------------------------------------------
> 
> 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      9 Apr 2005 23:48:38 -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   9 Apr 2005 23:48:40 -0000
> @@ -66,7 +66,7 @@ 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 +78,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
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Classpath-patches mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/classpath-patches
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFCWISPG9cfwmwwEtoRAlJPAJ9TlULI+MdDsXn2vaun5a0w8bqsYwCeOGxp
bsJt5j2OwZegpdWrPkKUkP4=
=EVPo
-----END PGP SIGNATURE-----