[cp-patches] Exclude .svn directories from tools.zip

Andrew Haley aph at redhat.com
Fri Nov 7 18:53:54 UTC 2008


David Daney wrote:
> Andrew Haley wrote:
>> 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  <aph at redhat.com>
>>
>>     * 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.
>>
> 
> tools.zip is not the only jar/zip file affected by this malady.  Take a
> look at libgcj-??.jar

zebedee:libjava $ jar tf libgcj-4.4.0.jar | fgrep .svn
zebedee:libjava $

Andrew.



More information about the Classpath-patches mailing list