Permalink
Browse files

Tab police

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1457570 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
sebbASF committed Mar 17, 2013
1 parent 9ac5163 commit 055b902d457a8aef5a61202054dd57c0f09779df
View
@@ -42,10 +42,10 @@
To build all and package up the files for distribution
ant distribution -Djmeter.version=vvvv [-Dsvn.revision=nnnnn]
-
+
Add -Ddisable-svnCheck=true to disable svn check, if you build from src archive or offline
- Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
- if you want build your own custom JMeter package.
+ Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
+ if you want build your own custom JMeter package.
To create a nightly build (separate bin/src/lib jars):
ant nightly [-Dsvn.revision=nnnnn]
@@ -151,7 +151,7 @@
<sourcePath path="${src.native}" />
<sourcePath path="${src.mongodb}" />
<sourcePath path="${src.report}" />
-
+
<auxClasspath>
<fileset dir="${lib.dir}">
<include name="*.jar"/>
@@ -342,7 +342,7 @@
<property file="build.properties"/> <!-- defines the library version numbers -->
<property name="resources.meta-inf" value="${build.res}/META-INF"/>
-
+
<patternset id="external.jars.notices">
<include name="LICENSE"/>
<include name="NOTICE"/>
@@ -380,8 +380,8 @@
<include name="${lib.dir}/${jdom.jar}"/>
<include name="${lib.dir}/${jms.jar}"/>
<include name="${lib.dir}/${js_rhino.jar}"/>
- <include name="${lib.dir}/${jodd-core.jar}"/>
- <include name="${lib.dir}/${jodd-lagarto.jar}"/>
+ <include name="${lib.dir}/${jodd-core.jar}"/>
+ <include name="${lib.dir}/${jodd-lagarto.jar}"/>
<include name="${lib.dir}/${jsoup.jar}"/>
<include name="${lib.dir}/${junit.jar}"/>
<include name="${lib.dir}/${logkit.jar}"/>
@@ -448,7 +448,7 @@
<pathelement location="${lib.dir}/${jdom.jar}"/>
<pathelement location="${lib.dir}/${jms.jar}"/>
<pathelement location="${lib.dir}/${js_rhino.jar}"/>
- <pathelement location="${lib.dir}/${jodd-core.jar}"/>
+ <pathelement location="${lib.dir}/${jodd-core.jar}"/>
<pathelement location="${lib.dir}/${jodd-lagarto.jar}"/>
<pathelement location="${lib.dir}/${jsoup.jar}"/>
<pathelement location="${lib.dir}/${junit.jar}"/>
@@ -492,7 +492,7 @@
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
</filterset>
-
+
<target name="init-version">
<tstamp/>
<!--
@@ -831,7 +831,7 @@
</classpath>
</javac>
</target>
-
+
<target name="compile-native" depends="compile-jorphan,compile-core,compile-components"
description="Compile components specific to Native sampling.">
<mkdir dir="${build.native}"/>
@@ -845,7 +845,7 @@
</classpath>
</javac>
</target>
-
+
<target name="compile-mongodb" depends="compile-jorphan,compile-core,compile-components"
description="Compile components specific to MongoDB sampling.">
<mkdir dir="${build.mongodb}"/>
@@ -880,7 +880,7 @@
<target name="prepare-resources"
description="Prepare some resources files, update date">
<mkdir dir="${build.res}" />
- <mkdir dir="${resources.meta-inf}" />
+ <mkdir dir="${resources.meta-inf}" />
<copy todir="${resources.meta-inf}" overwrite="yes" filtering="yes"
encoding="${encoding}">
<filterset refid="version.filters"/>
@@ -1148,7 +1148,7 @@ run JMeter unless all the JMeter jars are added.
<fileset dir="${build.mongodb}" includes="**/*.class" />
<fileset dir="${src.mongodb}" includes="**/*.properties" />
</jar>
-
+
<jar jarfile="${lib.dir}/jorphan.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
<zipfileset file="${resources.meta-inf}/default.notice"
fullpath="META-INF/NOTICE" />
@@ -1302,8 +1302,8 @@ run JMeter unless all the JMeter jars are added.
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
<include name="${src.docs}/**"/>
- <!-- Include some resources -->
- <include name="${res.dir}/**"/>
+ <!-- Include some resources -->
+ <include name="${res.dir}/**"/>
<!-- Exclude binary types (and JMX/JTL, which are not OS-dependent) -->
<exclude name="${src.docs}/images/**"/>
<exclude name="${src.docs}/**/*.jmx"/>
@@ -1417,7 +1417,7 @@ run JMeter unless all the JMeter jars are added.
<local name="version.match"/>
<condition property="version.match">
<resourcecontains resource="${src.core}/org/apache/jmeter/util/JMeterVersion.java"
- substring='VERSION = "${jmeter.version}";'/>
+ substring='VERSION = "${jmeter.version}";'/>
</condition>
<fail message="jmeter.version must be same as JMeterVersion.VERSION" unless="version.match"/>
</target>
@@ -2341,7 +2341,7 @@ run JMeter unless all the JMeter jars are added.
<antcall target="batchtest">
<param name="remote" value="-Rlocalhost:${rmi_port}"/>
<param name="taskname" value="client"/>
- <param name="batchtest.name" value="BatchTestLocalRemote"/>
+ <param name="batchtest.name" value="BatchTestLocalRemote"/>
</antcall>
</sequential>
</parallel>
@@ -2483,9 +2483,9 @@ run JMeter unless all the JMeter jars are added.
<param name="batchtest.name" value="Bug52310"/>
</antcall>
<antcall target="batchtest">
- <param name="batchtest.name" value="Bug52968"/>
- </antcall>
-
+ <param name="batchtest.name" value="Bug52968"/>
+ </antcall>
+
<antcall target="batchtest">
<param name="batchtest.name" value="Bug50898"/>
</antcall>
@@ -2755,14 +2755,14 @@ run JMeter unless all the JMeter jars are added.
<process_jarfile jarname="jdom"/>
<process_jarfile jarname="jms"/>
<process_jarfile jarname="js_rhino"/>
- <process_jarfile jarname="jodd-core"/>
+ <process_jarfile jarname="jodd-core"/>
<process_jarfile jarname="jodd-lagarto"/>
<process_jarfile jarname="jsoup"/>
<process_jarfile jarname="junit"/>
<process_jarfile jarname="logkit"/>
<process_jarfile jarname="mongo-java-driver"/>
<process_jarfile jarname="serializer"/>
- <process_jarfile jarname="slf4j-api"/>
+ <process_jarfile jarname="slf4j-api"/>
<process_jarfile jarname="soap"/>
<process_jarfile jarname="tidy"/>
<process_jarfile jarname="tika-core"/>
View
@@ -53,7 +53,7 @@
<target name="package" depends="compile">
<mkdir dir="${jar.dest}"/>
<jar jarfile="${jar.dest}/${jar.file}" basedir="${build.addons}">
- <fileset dir="${src.addons}" includes="**/*.properties"/>
+ <fileset dir="${src.addons}" includes="**/*.properties"/>
</jar>
</target>
Oops, something went wrong.

0 comments on commit 055b902

Please sign in to comment.