Re: [cp-patches] FYI: Fastjar support

[Mark Wielaard]

Hi Guilhem,

On Sat, 2006-01-21 at 19:48 +0100, Guilhem Lavaux wrote:
> Here is a patch to add fastjar support to classpath. First, configure 
> checks for zip, then fastjar if no --with-fastjar is supplied. If 
> --with-fastjar is supplied it will use the given fastjar in any cases.
> 
> ChangeLog entry:
> 
> 2006-01-21  Guilhem Lavaux  <address@hidden>
> 
>       * m4/acinclude.m4
>       (CLASSPATH_WITH_GLIBJ): Add support for fastjar.
> 
>       * lib/Makefile.am: Likewise.

We need a similar change for the examples.zip file.

2006-01-23  Mark Wielaard  <address@hidden>

        * examples/Makefile.am: Add support for fastjar.

Committed,

Mark

diff -u -r1.8 Makefile.am
--- examples/Makefile.am        7 Jan 2006 22:53:21 -0000       1.8
+++ examples/Makefile.am        23 Jan 2006 13:44:42 -0000
@@ -95,7 +95,10 @@
        mkdir -p classes/gnu/classpath/examples/icons
        cp $(EXAMPLE_ICONS) classes/gnu/classpath/examples/icons
        $(JCOMPILER) -d classes $(EXAMPLE_JAVA_FILES)
-       cd classes; $(ZIP) -r ../$(EXAMPLE_ZIP) .; cd ..
+       cd classes
+       if test "$(ZIP)" != ""; then $(ZIP) -r ../$(EXAMPLE_ZIP) .; fi
+       if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(EXAMPLE_ZIP) .; fi
+       cd ..
        rm -rf classes

 # Zip file be gone! (and make sure the classes are gone too)

signature.asc
Description: This is a digitally signed message part