jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1532934 - /jmeter/trunk/build.xml
Date Wed, 16 Oct 2013 23:11:31 GMT
Author: sebb
Date: Wed Oct 16 23:11:31 2013
New Revision: 1532934

URL: http://svn.apache.org/r1532934
Log:
Ensure encoding is always specified when using fixcrlf

Modified:
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1532934&r1=1532933&r2=1532934&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Wed Oct 16 23:11:31 2013
@@ -899,7 +899,7 @@
         <include name="*.notice" />
       </fileset>
     </copy>
-    <fixcrlf srcdir="${resources.meta-inf}" eol="crlf" includes="*.license *.notice"/>
+    <fixcrlf encoding="${encoding}" srcdir="${resources.meta-inf}" eol="crlf" includes="*.license
*.notice"/>
   </target>
 
 <!--
@@ -1196,7 +1196,7 @@ run JMeter unless all the JMeter jars ar
   </target>
 
   <target name="install" depends="package" description="Install JMeter. (Compiles code
and creates jars)">
-    <fixcrlf srcdir="." eol="lf" includes="bin/*.sh bin/jmeter bin/jmeter-server bin/jmeter-report"/>
+    <fixcrlf encoding="${encoding}" srcdir="." eol="lf" includes="bin/*.sh bin/jmeter
bin/jmeter-server bin/jmeter-report"/>
   </target>
 
   <target name="install-examples" depends="compile-examples" description="Build and installs
the example components.">
@@ -2473,7 +2473,7 @@ run JMeter unless all the JMeter jars ar
     <property name="batchtest.value" value="dummy"/>
 
     <!-- Fix the EOL in case the file was derived from the "wrong" archive type -->
-    <fixcrlf srcdir="${batchtest.inp}" includes="${batchtest.name}.csv"/>
+    <fixcrlf encoding="${encoding}" srcdir="${batchtest.inp}" includes="${batchtest.name}.csv"/>
 
     <echo level="info" message="Starting ${batchtest.name} using ${remote}"/>
 



Mime
View raw message