View | Details | Raw Unified | Return to bug 60435
Collapse All | Expand All

(-)a/build.xml (-28 / +47 lines)
Lines 26-68 Link Here
26
  and these must be unpacked into the same directory structure.
26
  and these must be unpacked into the same directory structure.
27
27
28
  To download additional jars needed for building the code and documentation:
28
  To download additional jars needed for building the code and documentation:
29
    ant download_jars
29
30
30
      ant download_jars
31
  To build JMeter from source:
32
    ant [install]
31
33
34
  To rebuild:
35
    ant clean install
32
36
33
    To build JMeter from source:
37
  To update documentation
34
      ant [install]
38
    ant docs-site [-Ddocs.force=true]
39
    ant docs-printable [-Ddocs.force=true]
40
  To build API documentation (Javadoc)
41
    ant docs-api
42
  To build all the docs
43
    ant docs-all [-Ddocs.force=true]
35
44
36
    To rebuild:
45
  To build all and package up the files for distribution
37
      ant clean install
46
    ant distribution -Djmeter.version=vvvv [-Dsvn.revision=nnnnn]
38
47
39
    To update documentation
48
  Add -Ddisable-svnCheck=true to disable svn check, if you build from src archive or offline
40
      ant docs-site [-Ddocs.force=true]
49
  Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
41
      ant docs-printable [-Ddocs.force=true]
50
    if you want build your own custom JMeter package.
42
    To build API documentation (Javadoc)
43
      ant docs-api
44
    To build all the docs
45
      ant docs-all [-Ddocs.force=true]
46
51
47
    To build all and package up the files for distribution
52
  To create a nightly build (separate bin/src/lib jars):
48
      ant distribution -Djmeter.version=vvvv [-Dsvn.revision=nnnnn]
53
    ant nightly [-Dsvn.revision=nnnnn]
49
54
50
    Add -Ddisable-svnCheck=true to disable svn check, if you build from src archive or offline
55
  To create tar and tgz of the web-site documentation (docs and api)
51
    Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
56
    ant site [ -Djmeter.version=vvvv ]
52
      if you want build your own custom JMeter package.
53
57
54
    To create a nightly build (separate bin/src/lib jars):
58
  To use a proxy export/set the following before running the tasks.
55
      ant nightly [-Dsvn.revision=nnnnn]
59
    export ANT_OPTS=-Dhttps.proxyHost=[hhhh] -Dhttps.proxyPort=[xxxx] -Dhttp.proxyHost=[hhhh] -Dhttp.proxyPort=[xxxx]
56
60
57
    To create tar and tgz of the web-site documentation (docs and api)
61
  For more info:
58
      ant site [ -Djmeter.version=vvvv ]
62
    ant -projecthelp
59
63
60
64
  To diagnose usage of deprecated APIs:
61
    For more info:
65
    ant -Ddeprecation=on clean compile
62
      ant -projecthelp
63
64
    To diagnose usage of deprecated APIs:
65
      ant -Ddeprecation=on clean compile
66
  </description>
66
  </description>
67
67
68
  <!--
68
  <!--
Lines 123-128 Link Here
123
  <property name="skip.bug52310" value="false" />
123
  <property name="skip.bug52310" value="false" />
124
  <property name="skip.test_https" value="false" />
124
  <property name="skip.test_https" value="false" />
125
125
126
  <!-- For simplicity, set the proxy host / port used by JMeter based on the same params used elsewhere. -->
127
  <!-- This will pull from ANT_OPTS if set there, or from command line -->
128
  <property name="jmeter.proxy.host" if:set="http.proxyHost" value="${http.proxyHost}" />
129
  <property name="jmeter.proxy.port" if:set="http.proxyPort" value="${http.proxyPort}" />
130
  <property name="jmeter.proxy.user" if:set="http.proxyUser" value="${http.proxyUser}" />
131
  <property name="jmeter.proxy.password" if:set="http.proxyPassword" value="${http.proxyPassword}" />
132
133
  <!-- Use https version only if http version is not set.  -->
134
  <property name="jmeter.proxy.host" if:set="https.proxyHost" value="${https.proxyHost}" />
135
  <property name="jmeter.proxy.port" if:set="https.proxyPort" value="${https.proxyPort}" />
136
  <property name="jmeter.proxy.user" if:set="https.proxyUser" value="${https.proxyUser}" />
137
  <property name="jmeter.proxy.password" if:set="https.proxyPassword" value="${https.proxyPassword}" />
138
126
  <target name="findbugs" description="Run the stand-alone Findbugs detector">
139
  <target name="findbugs" description="Run the stand-alone Findbugs detector">
127
    <echoproperties prefix="findbugs"/>
140
    <echoproperties prefix="findbugs"/>
128
    <mkdir dir="reports"/>
141
    <mkdir dir="reports"/>
Lines 2577-2582 run JMeter unless all the JMeter jars are added. Link Here
2577
      <arg value="-l"/>
2590
      <arg value="-l"/>
2578
      <arg value="${batchtest.name}.jtl"/>
2591
      <arg value="${batchtest.name}.jtl"/>
2579
      <arg value="${remote}"/>
2592
      <arg value="${remote}"/>
2593
2594
      <!-- Allow a proxy to be used when running JMeter -->
2595
      <arg value="-P${jmeter.proxy.port}" if:set="jmeter.proxy.port" />
2596
      <arg value="-H${jmeter.proxy.host}" if:set="jmeter.proxy.host" />
2597
      <arg value="-u${jmeter.proxy.username}" if:set="jmeter.proxy.username" />
2598
      <arg value="-a${jmeter.proxy.password}" if:set="jmeter.proxy.password" />
2599
2580
      <!-- Check properties can be passed to local/remote tests -->
2600
      <!-- Check properties can be passed to local/remote tests -->
2581
      <arg value="-Jmodule=Module"/>
2601
      <arg value="-Jmodule=Module"/>
2582
      <arg value="-Gmodule=Module"/>
2602
      <arg value="-Gmodule=Module"/>
2583
- 

Return to bug 60435