svn commit: r1637321 - /jmeter/trunk/build.xml

[rj...@apache.org]

Author: rjung
Date: Fri Nov  7 09:34:11 2014
New Revision: 1637321

URL: http://svn.apache.org/r1637321
Log:
Build script fixes:
- include "mirror-server" in distribution
  ("mirror-server.sh" is already included and
  "mirror-server" is only a trivial wrapper)
- include "mirror-server" and "jmeter-report"
  in crlf handling

Modified:
    jmeter/trunk/build.xml

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1637321&r1=1637320&r2=1637321&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Fri Nov  7 09:34:11 2014
@@ -1204,7 +1204,7 @@ run JMeter unless all the JMeter jars ar
   </target>
 
   <target name="install" depends="package" description="Install JMeter. (Compiles code and creates jars)">
-    <fixcrlf encoding="${encoding}" 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 bin/mirror-server"/>
   </target>
 
   <target name="install-examples" depends="compile-examples" description="Build and installs the example components.">
@@ -1273,7 +1273,7 @@ run JMeter unless all the JMeter jars ar
     <include name="${dest.jar.jmeter}/heapdump.*"/>
     <include name="${dest.jar.jmeter}/jmeter*"/>
     <exclude name="${dest.jar.jmeter}/jmeter.properties"/>
-    <include name="${dest.jar.jmeter}/mirror-server.*"/>
+    <include name="${dest.jar.jmeter}/mirror-server*"/>
     <include name="${dest.jar.jmeter}/shutdown.*"/>
     <include name="${dest.jar.jmeter}/stoptest.*"/>
     <!-- Fake SSL cert for JMeter proxy recorder in https -->
@@ -1311,7 +1311,7 @@ run JMeter unless all the JMeter jars ar
       These need special handling to create the correct file mode
   -->
   <property name="dist.executables"
-    value="${dest.jar.jmeter}/jmeter ${dest.jar.jmeter}/jmeter-server ${dest.jar.jmeter}/*.sh ${extras.dir}/*.sh"/>
+    value="${dest.jar.jmeter}/jmeter ${dest.jar.jmeter}/jmeter-server ${dest.jar.jmeter}/jmeter-report ${dest.jar.jmeter}/mirror-server ${dest.jar.jmeter}/*.sh ${extras.dir}/*.sh"/>
 
   <!-- List of files in source distribution that are eol=native -->
   <!--