You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2016/12/18 20:34:13 UTC
svn commit: r1774943 - /jmeter/trunk/build.xml
Author: fschumacher
Date: Sun Dec 18 20:34:13 2016
New Revision: 1774943
URL: http://svn.apache.org/viewvc?rev=1774943&view=rev
Log:
Tabpolice
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1774943&r1=1774942&r2=1774943&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Dec 18 20:34:13 2016
@@ -517,20 +517,19 @@
<pathelement location="${lib.dir}/${xstream.jar}"/>
<!-- Generated jars -->
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
- <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
+ <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
<!-- API-only jars-->
<fileset dir="${lib.api}" includes="*.jar"/>
<!-- Optional jars -->
<fileset dir="${lib.opt}" includes="*.jar"/>
</path>
-
<path id="slf4j_logkit_classpath">
<!-- Externally produced jars -->
<pathelement location="${lib.dir}/${logkit.jar}"/>
<pathelement location="${lib.dir}/${slf4j-api.jar}"/>
</path>
-
+
<!-- Anakia classpath -->
<path id="anakia.classpath">
<pathelement location="${lib.doc}/${velocity.jar}"/>
@@ -585,7 +584,7 @@
</target>
<target name="ant-version" depends="_check_ant-version">
- <echo level="info">ant.version = ${ant.version}</echo>
+ <echo level="info">ant.version = ${ant.version}</echo>
</target>
<target name="_check_ant-version">
@@ -598,7 +597,7 @@
</condition>
</fail>
</target>
-
+
<target name="init-docs" depends="report-anakia-missing">
<echo level="info">eclipse.anakia = ${eclipse.anakia}</echo>
</target>
@@ -823,15 +822,15 @@
</classpath>
</javac>
</target>
-
+
<target name="compile-slf4j_logkit" description="Compile JMeter slf4j LogKit bootstrap classes.">
<mkdir dir="${build.slf4j_logkit}"/>
<javac srcdir="${src.slf4j_logkit}" destdir="${build.slf4j_logkit}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
<classpath>
- <path refid="slf4j_logkit_classpath"/>
- </classpath>
+ <path refid="slf4j_logkit_classpath"/>
+ </classpath>
</javac>
</target>
@@ -1322,7 +1321,7 @@ run JMeter unless all the JMeter jars ar
<include name="${dest.jar}/"/>
<include name="${lib.dir}/bshclient.jar"/>
<include name="${lib.dir}/jorphan.jar"/>
- <include name="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"/>
+ <include name="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"/>
<include name="${lib.dir}/junit/test.jar"/>
<include name="${dest.jar.jmeter}/ApacheJMeter.jar"/>
<!-- Help documentation, binary files -->
@@ -2648,15 +2647,15 @@ run JMeter unless all the JMeter jars ar
<antcall target="batchtest">
<param name="batchtest.name" value="HTMLParserTestFile_2"/>
</antcall>
- <!-- Disable Test which seems wrong -->
- <!--
+ <!-- Disable Test which seems wrong -->
+ <!--
<antcall target="batchtest">
Using the same module controller name in command line mode causes NPE
<param name="batchtest.name" value="Bug47165"/>
</antcall>
- -->
+
<antcall target="batchtest">
- <!-- variable in IPSource failed HTTP request if "Concurrent Pool Size" is enabled -->
+ <!-- variable in IPSource failed HTTP request if "Concurrent Pool Size" is enabled -->
<!-- N.B. requires access to jmeter.apache.org -->
<param name="batchtest.name" value="Bug52310"/>
<param name="skip.batchtest" value="${skip.bug52310}" />
@@ -3289,7 +3288,7 @@ run JMeter unless all the JMeter jars ar
<pathelement location="${lib.opt}/${rat-tasks.jar}"/>
</classpath>
</taskdef>
- <mkdir dir="${basedir}/reports/" />
+ <mkdir dir="${basedir}/reports/" />
<rat:report reportfile="reports/rat-report.txt">
<fileset dir="." excludesfile="rat-excludes.txt"/>
</rat:report>