Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 25982d12c -> 54215a21f
build.xml - exclude *.ps1 from fixcrlf Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc8b4e11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc8b4e11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc8b4e11 Branch: refs/heads/cassandra-2.1 Commit: dc8b4e111886c257e6bdeabbf290b12506803ded Parents: 81f8e37 Author: Joshua McKenzie <josh.mcken...@datastax.com> Authored: Tue Aug 12 16:37:20 2014 -0500 Committer: Joshua McKenzie <josh.mcken...@datastax.com> Committed: Tue Aug 12 16:37:20 2014 -0500 ---------------------------------------------------------------------- build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc8b4e11/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index a76ce36..ae77274 100644 --- a/build.xml +++ b/build.xml @@ -902,9 +902,9 @@ description="Create Cassandra release artifacts"> <mkdir dir="${dist.dir}"/> <!-- fix the control linefeed so that builds on windows works on linux --> - <fixcrlf srcdir="bin" includes="**/*" excludes="**/*.bat" eol="lf" eof="remove" /> - <fixcrlf srcdir="conf" includes="**/*" excludes="**/*.bat" eol="lf" eof="remove" /> - <fixcrlf srcdir="tools/bin" includes="**/*" excludes="**/*.bat" eol="lf" eof="remove" /> + <fixcrlf srcdir="bin" includes="**/*" excludes="**/*.bat, **/*.ps1" eol="lf" eof="remove" /> + <fixcrlf srcdir="conf" includes="**/*" excludes="**/*.bat, **/*.ps1" eol="lf" eof="remove" /> + <fixcrlf srcdir="tools/bin" includes="**/*" excludes="**/*.bat, **/*.ps1" eol="lf" eof="remove" /> <copy todir="${dist.dir}/lib"> <fileset dir="${build.lib}"/> <fileset dir="${build.dir}">