You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/06/16 13:17:27 UTC

svn commit: r785164 - /tomcat/container/branches/tc4.1.x/build.xml

Author: markt
Date: Tue Jun 16 11:17:26 2009
New Revision: 785164

URL: http://svn.apache.org/viewvc?rev=785164&view=rev
Log:
Update exclusion list for EOL filtering

Modified:
    tomcat/container/branches/tc4.1.x/build.xml

Modified: tomcat/container/branches/tc4.1.x/build.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?rev=785164&r1=785163&r2=785164&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Tue Jun 16 11:17:26 2009
@@ -438,7 +438,7 @@
       </fileset>
     </copy>
     <fixcrlf srcdir="${tomcat.dist}/${final-src.name}" 
-     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico" eol="lf"/>
+     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia" eol="lf"/>
     <tar longfile="gnu" tarfile="${tomcat.dist}/${final-src.name}.tar">
       <tarfileset dir="${tomcat.dist}" mode="755">
         <include name="${final-src.name}/${jtc.project}/jk/native/buildconf.sh" />



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r785164 - /tomcat/container/branches/tc4.1.x/build.xml

Posted by sebb <se...@gmail.com>.
On 16/06/2009, Mark Thomas <ma...@apache.org> wrote:
> sebb wrote:
>  > On 16/06/2009, markt@apache.org <ma...@apache.org> wrote:
>  >> Author: markt
>  >>  Date: Tue Jun 16 11:17:26 2009
>  >>  New Revision: 785164
>  >>
>  >>  URL: http://svn.apache.org/viewvc?rev=785164&view=rev
>  >>  Log:
>  >>  Update exclusion list for EOL filtering
>  >>
>  >>  Modified:
>  >>     tomcat/container/branches/tc4.1.x/build.xml
>  >>
>  >>  Modified: tomcat/container/branches/tc4.1.x/build.xml
>  >>  URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?rev=785164&r1=785163&r2=785164&view=diff
>  >>  ==============================================================================
>  >>  --- tomcat/container/branches/tc4.1.x/build.xml (original)
>  >>  +++ tomcat/container/branches/tc4.1.x/build.xml Tue Jun 16 11:17:26 2009
>  >>  @@ -438,7 +438,7 @@
>  >>        </fileset>
>  >>      </copy>
>  >>      <fixcrlf srcdir="${tomcat.dist}/${final-src.name}"
>  >
>  > If you add
>  >
>  >       fixlast="false"
>
>
> I know. I'm already working on that but as a separate commit. Got
>  distracted half way through. Will be committed shortly.

OK, NP.

>  Mark
>
>
>  >
>  > that will prevent spurious additional EOLs and make it easier to
>  > compare archives.
>  >
>  >>  -     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico" eol="lf"/>
>  >>  +     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia" eol="lf"/>
>  >>      <tar longfile="gnu" tarfile="${tomcat.dist}/${final-src.name}.tar">
>  >>        <tarfileset dir="${tomcat.dist}" mode="755">
>  >>          <include name="${final-src.name}/${jtc.project}/jk/native/buildconf.sh" />
>  >>
>  >>
>  >>
>  >>  ---------------------------------------------------------------------
>  >>  To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>  >>  For additional commands, e-mail: dev-help@tomcat.apache.org
>  >>
>  >>
>  >
>  > ---------------------------------------------------------------------
>  > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>  > For additional commands, e-mail: dev-help@tomcat.apache.org
>  >
>
>
>
>  ---------------------------------------------------------------------
>  To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>  For additional commands, e-mail: dev-help@tomcat.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r785164 - /tomcat/container/branches/tc4.1.x/build.xml

Posted by Mark Thomas <ma...@apache.org>.
sebb wrote:
> On 16/06/2009, markt@apache.org <ma...@apache.org> wrote:
>> Author: markt
>>  Date: Tue Jun 16 11:17:26 2009
>>  New Revision: 785164
>>
>>  URL: http://svn.apache.org/viewvc?rev=785164&view=rev
>>  Log:
>>  Update exclusion list for EOL filtering
>>
>>  Modified:
>>     tomcat/container/branches/tc4.1.x/build.xml
>>
>>  Modified: tomcat/container/branches/tc4.1.x/build.xml
>>  URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?rev=785164&r1=785163&r2=785164&view=diff
>>  ==============================================================================
>>  --- tomcat/container/branches/tc4.1.x/build.xml (original)
>>  +++ tomcat/container/branches/tc4.1.x/build.xml Tue Jun 16 11:17:26 2009
>>  @@ -438,7 +438,7 @@
>>        </fileset>
>>      </copy>
>>      <fixcrlf srcdir="${tomcat.dist}/${final-src.name}"
> 
> If you add
> 
>       fixlast="false"

I know. I'm already working on that but as a separate commit. Got
distracted half way through. Will be committed shortly.

Mark

> 
> that will prevent spurious additional EOLs and make it easier to
> compare archives.
> 
>>  -     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico" eol="lf"/>
>>  +     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia" eol="lf"/>
>>      <tar longfile="gnu" tarfile="${tomcat.dist}/${final-src.name}.tar">
>>        <tarfileset dir="${tomcat.dist}" mode="755">
>>          <include name="${final-src.name}/${jtc.project}/jk/native/buildconf.sh" />
>>
>>
>>
>>  ---------------------------------------------------------------------
>>  To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>>  For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r785164 - /tomcat/container/branches/tc4.1.x/build.xml

Posted by sebb <se...@gmail.com>.
On 16/06/2009, markt@apache.org <ma...@apache.org> wrote:
> Author: markt
>  Date: Tue Jun 16 11:17:26 2009
>  New Revision: 785164
>
>  URL: http://svn.apache.org/viewvc?rev=785164&view=rev
>  Log:
>  Update exclusion list for EOL filtering
>
>  Modified:
>     tomcat/container/branches/tc4.1.x/build.xml
>
>  Modified: tomcat/container/branches/tc4.1.x/build.xml
>  URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?rev=785164&r1=785163&r2=785164&view=diff
>  ==============================================================================
>  --- tomcat/container/branches/tc4.1.x/build.xml (original)
>  +++ tomcat/container/branches/tc4.1.x/build.xml Tue Jun 16 11:17:26 2009
>  @@ -438,7 +438,7 @@
>        </fileset>
>      </copy>
>      <fixcrlf srcdir="${tomcat.dist}/${final-src.name}"

If you add

      fixlast="false"

that will prevent spurious additional EOLs and make it easier to
compare archives.

>  -     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico" eol="lf"/>
>  +     excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia" eol="lf"/>
>      <tar longfile="gnu" tarfile="${tomcat.dist}/${final-src.name}.tar">
>        <tarfileset dir="${tomcat.dist}" mode="755">
>          <include name="${final-src.name}/${jtc.project}/jk/native/buildconf.sh" />
>
>
>
>  ---------------------------------------------------------------------
>  To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>  For additional commands, e-mail: dev-help@tomcat.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org