I found a lot of very surprising stuff in tools.zip; fixed thusly.
This doesn't affect straight Classpath builds, but it does affect gcj.

Andrew.


2008-11-05  Andrew Haley  <[EMAIL PROTECTED]>

        * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
        .svn directories.

Index: classpath/tools/Makefile.am
===================================================================
--- classpath/tools/Makefile.am (revision 141575)
+++ classpath/tools/Makefile.am (working copy)
@@ -380,11 +380,11 @@
 endif

 if WITH_JAR
-CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) .
-UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) .
+CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type 
f -print`
+UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type 
f -print`
 else
-CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) .
-UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) .
+CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type 
f -print`
+UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o 
-type f -print`
 endif

 ## First add classpath tools stuff.

Reply via email to