This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: Patch: FYI: no .svn files in jar
- From: Andrew Haley <aph at redhat dot com>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Wed, 31 Jan 2007 09:29:52 +0000
- Subject: Re: Patch: FYI: no .svn files in jar
- References: <m31wlcw8ll.fsf@localhost.localdomain>
Tom Tromey writes:
> I'm checking this in.
>
> David Daney pointed out that we had .svn stuff in the built
> libgcj.jar. This patch fixes the bug. Tested with fastjar and our
> jar script.
>
> Tom
>
> 2007-01-30 Tom Tromey <tromey@redhat.com>
>
> * Makefile.in: Rebuilt.
> * Makefile.am (libgcj-$(gcc_version).jar): Rewrote.
>
> Index: Makefile.am
> ===================================================================
> --- Makefile.am (revision 121314)
> +++ Makefile.am (working copy)
> @@ -332,8 +332,10 @@
> libgcj-$(gcc_version).jar: classpath/lib/compile-classes
> ## Note that this now omits the property files.
> ## It doesn't matter since we don't use the jar at runtime.
> - here=`pwd`; cd $(srcdir)/classpath/lib; $(JAR) -cfM \
> - $$here/libgcj-$(gcc_version).jar gnu java javax org sun
> + here=`pwd`; cd $(srcdir)/classpath/lib; \
> + find gnu java javax org sun -name '*.class' -print | \
> + fgrep -v .svn | \
> + $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar
>
> libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip
> cp $< $@
FTI, to avoid .svn directory contents in find commands you should so
find . -name .svn -prune -o <rest of find command>
Andrew.