cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: fix CRLF in bash scripts when building on Windows patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798
Date Mon, 17 Mar 2014 16:37:21 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 60882c15c -> dd60ab474
  refs/heads/trunk 3d017f08f -> c3d9280e4


fix CRLF in bash scripts when building on Windows
patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd60ab47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd60ab47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd60ab47

Branch: refs/heads/cassandra-2.1
Commit: dd60ab474053ebd4cc38ed857df355293ae2c491
Parents: 60882c1
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Mar 17 11:37:10 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Mar 17 11:37:10 2014 -0500

----------------------------------------------------------------------
 build.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd60ab47/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a938b25..83ce003 100644
--- a/build.xml
+++ b/build.xml
@@ -886,6 +886,10 @@
     <target name="artifacts" depends="jar,javadoc"
             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"
/>
       <copy todir="${dist.dir}/lib">
         <fileset dir="${build.lib}"/>
         <fileset dir="${build.dir}">


Mime
View raw message