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 2018/01/07 14:20:01 UTC
svn commit: r1820463 - /jmeter/trunk/build.xml
Author: fschumacher
Date: Sun Jan 7 14:20:01 2018
New Revision: 1820463
URL: http://svn.apache.org/viewvc?rev=1820463&view=rev
Log:
No tabs in xml files.
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1820463&r1=1820462&r2=1820463&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Jan 7 14:20:01 2018
@@ -1693,25 +1693,25 @@ run JMeter unless all the JMeter jars ar
</jar>
<antcall target="generate_src_artifacts" />
</target>
-
+
<target name="generate_src_artifacts">
<jar destfile="${maven.dir}/ApacheJMeter-sources.jar">
- <fileset dir="${src.core}" includes="**/NewDriver*.java,**/DynamicClassLoader*.java,**/ShutdownClient.java"
- excludes="**/*.png,**/*.xml,**/*.properties,**/*.txt,**/.html" />
- </jar>
+ <fileset dir="${src.core}" includes="**/NewDriver*.java,**/DynamicClassLoader*.java,**/ShutdownClient.java"
+ excludes="**/*.png,**/*.xml,**/*.properties,**/*.txt,**/.html" />
+ </jar>
<jar destfile="${maven.dir}/ApacheJMeter_core-sources.jar">
- <fileset dir="${src.core}" excludes="**/NewDriver*.java,**/DynamicClassLoader*.java,**/ShutdownClient.java,**/*.png,**/*.xml,**/*.properties,**/*.txt,**/.html" />
+ <fileset dir="${src.core}" excludes="**/NewDriver*.java,**/DynamicClassLoader*.java,**/ShutdownClient.java,**/*.png,**/*.xml,**/*.properties,**/*.txt,**/.html" />
</jar>
<generate_src_artifact artifactname="ApacheJMeter_http" srcdir="${src.http}" targetdir="${maven.dir}" />
<generate_src_artifact artifactname="ApacheJMeter_ftp" srcdir="${src.ftp}" targetdir="${maven.dir}" />
<generate_src_artifact artifactname="ApacheJMeter_jdbc" srcdir="${src.jdbc}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="ApacheJMeter_java" srcdir="${src.java}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="ApacheJMeter_junit" srcdir="${src.junit}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="ApacheJMeter_components" srcdir="${src.components}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="ApacheJMeter_functions" srcdir="${src.functions}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="jorphan" srcdir="${src.jorphan}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="ApacheJMeter_ldap" srcdir="${src.ldap}" targetdir="${maven.dir}" />
- <generate_src_artifact artifactname="ApacheJMeter_tcp" srcdir="${src.tcp}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="ApacheJMeter_java" srcdir="${src.java}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="ApacheJMeter_junit" srcdir="${src.junit}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="ApacheJMeter_components" srcdir="${src.components}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="ApacheJMeter_functions" srcdir="${src.functions}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="jorphan" srcdir="${src.jorphan}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="ApacheJMeter_ldap" srcdir="${src.ldap}" targetdir="${maven.dir}" />
+ <generate_src_artifact artifactname="ApacheJMeter_tcp" srcdir="${src.tcp}" targetdir="${maven.dir}" />
<generate_src_artifact artifactname="ApacheJMeter_mail" srcdir="${src.mail}" targetdir="${maven.dir}" />
<generate_src_artifact artifactname="ApacheJMeter_jms" srcdir="${src.jms}" targetdir="${maven.dir}" />
<generate_src_artifact artifactname="ApacheJMeter_native" srcdir="${src.native}" targetdir="${maven.dir}" />
@@ -1719,7 +1719,7 @@ run JMeter unless all the JMeter jars ar
</target>
<macrodef name="generate_src_artifact">
<attribute name="artifactname"/>
- <attribute name="srcdir" />
+ <attribute name="srcdir" />
<attribute name="targetdir"/>
<sequential>
<jar destfile="@{targetdir}/@{artifactname}-sources.jar">
@@ -2037,12 +2037,12 @@ run JMeter unless all the JMeter jars ar
<attribute name="repositoryId" default="${@{type}.repositoryId}"/>
<sequential>
<local name="artifact_has_source"/>
- <condition property="artifact_has_source" value="" else="XX">
- <and>
- <available file="${maven.dir}/@{stem}-sources.jar"/>
- </and>
- </condition>
- <echo>Artifact @{stem} => artifact_has_source='${artifact_has_source}'</echo>
+ <condition property="artifact_has_source" value="" else="XX">
+ <and>
+ <available file="${maven.dir}/@{stem}-sources.jar"/>
+ </and>
+ </condition>
+ <echo>Artifact @{stem} => artifact_has_source='${artifact_has_source}'</echo>
<java classname="org.codehaus.classworlds.Launcher"
fork="true"
dir="${basedir}"
@@ -3067,7 +3067,7 @@ run JMeter unless all the JMeter jars ar
<batchtest todir="reports" skipNonTests="true">
<fileset dir="${build.test}">
<include name="**/*Spec.class" />
- </fileset>
+ </fileset>
<fileset dir="${src.test}">
<include name="**/*Test*.java" />
<exclude name="**/AllTests.java" />