Author: markt
Date: Tue Jun 16 12:17:08 2009
New Revision: 785174
URL: http://svn.apache.org/viewvc?rev=785174&view=rev
Log:
Don't add blank lines to the end of files when fixing the line endings for the
tar.gz distro
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=785174&r1=785173&r2=785174&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Tue Jun 16 12:17:08 2009
@@ -213,9 +213,11 @@
</copy>
<!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"/>
- <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
+ fixlast="false"/>
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
+ fixlast="false"/>
+ <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
</target>
@@ -391,8 +393,9 @@
</fileset>
</copy>
<fixcrlf srcdir="${tomcat.dist}/${final.name}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/${final.name}/conf" eol="lf"/>
+ includes="*.txt,LICENSE,NOTICE" eol="lf" fixlast="false"/>
+ <fixcrlf srcdir="${tomcat.dist}/${final.name}/conf" eol="lf"
+ fixlast="false"/>
<tar longfile="gnu" tarfile="${tomcat.dist}/${final.name}.tar">
<tarfileset dir="${tomcat.dist}" mode="755">
<include name="${final.name}/bin/catalina.sh" />
@@ -438,7 +441,8 @@
</fileset>
</copy>
<fixcrlf srcdir="${tomcat.dist}/${final-src.name}"
-
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia"
eol="lf"/>
+
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia"
+ eol="lf" fixlast="false"/>
<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: [email protected]
For additional commands, e-mail: [email protected]
