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

(-)a/build.xml (-2 / +8 lines)
Lines 3027-3033 run JMeter unless all the JMeter jars are added. Link Here
3027
  </target>
3027
  </target>
3028
3028
3029
  <!-- Get a zip file and unpack it -->
3029
  <!-- Get a zip file and unpack it -->
3030
  <target name="_get_zipfile" if="_get_zipfile" unless="file.exists">
3030
  <target name="_get_zipfile" if="_get_zipfile" unless="file.exists" depends="setproxy">
3031
    <get src="${loc}/${zip}"
3031
    <get src="${loc}/${zip}"
3032
         dest="${build.dir}/${zip}"
3032
         dest="${build.dir}/${zip}"
3033
         usetimestamp="true" ignoreerrors="false"/>
3033
         usetimestamp="true" ignoreerrors="false"/>
Lines 3048-3054 run JMeter unless all the JMeter jars are added. Link Here
3048
  </target>
3048
  </target>
3049
3049
3050
  <!-- Download a jar file and check its hash; if correct, move to correct directory -->
3050
  <!-- Download a jar file and check its hash; if correct, move to correct directory -->
3051
  <target name="_get_jarfile" if="_get_jarfile" unless="file.exists">
3051
  <target name="_get_jarfile" if="_get_jarfile" unless="file.exists" depends="setproxy">
3052
    <echo message="Fetching: ${path}/${jar}" level="info"/>
3052
    <echo message="Fetching: ${path}/${jar}" level="info"/>
3053
    <get src="${loc}/${jar}"
3053
    <get src="${loc}/${jar}"
3054
         dest="${build.dir}/${jar}"
3054
         dest="${build.dir}/${jar}"
Lines 3573-3576 run JMeter unless all the JMeter jars are added. Link Here
3573
3573
3574
  <target name="nightlysonar" depends="_coverage.prepare, nightly, _coverage.report, _sonar" />
3574
  <target name="nightlysonar" depends="_coverage.prepare, nightly, _coverage.report, _sonar" />
3575
3575
3576
  <target name="setproxy" if="${proxy.use}">
3577
    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
3578
              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
3579
    <echo message="Using ${proxy.host}:${proxy.port} to download file"/>
3580
  </target>
3581
3576
</project>
3582
</project>

Return to bug 60886