Skip to content

Commit 2a97f64

Browse files
authored
Merge pull request #885 from processing/fix-ant-download-4
Retry the failing ant download at least a few times
2 parents 252e46f + a6ef5eb commit 2a97f64

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

app/build.xml

+21-17
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,27 @@
2828
</condition>
2929

3030
<target name="download-ant" unless="ant.present">
31-
<get src="${ant.url}" dest="${ant.zip}"
32-
ignoreerrors="${ant.ignorable}"
33-
usetimestamp="true" />
34-
35-
<property name="ant.zip.prefix" value="apache-ant-${ant.version.num}/lib" />
36-
37-
<unzip src="${ant.zip}" dest="lib">
38-
<patternset>
39-
<!-- unzip a single jar from the ant.zip.prefix subdirectory in the .zip -->
40-
<include name="${ant.zip.prefix}/ant.jar" />
41-
<include name="${ant.zip.prefix}/ant-launcher.jar" />
42-
</patternset>
43-
<mapper>
44-
<!-- remove the ant.zip.prefix from the path when saving the .jar -->
45-
<globmapper from="${ant.zip.prefix}/*" to="*" />
46-
</mapper>
47-
</unzip>
31+
<retry retrycount="5" retrydelay="10000">
32+
<sequential>
33+
<get src="${ant.url}" dest="${ant.zip}"
34+
ignoreerrors="${ant.ignorable}"
35+
usetimestamp="true" />
36+
37+
<property name="ant.zip.prefix" value="apache-ant-${ant.version.num}/lib" />
38+
39+
<unzip src="${ant.zip}" dest="lib">
40+
<patternset>
41+
<!-- unzip a single jar from the ant.zip.prefix subdirectory in the .zip -->
42+
<include name="${ant.zip.prefix}/ant.jar" />
43+
<include name="${ant.zip.prefix}/ant-launcher.jar" />
44+
</patternset>
45+
<mapper>
46+
<!-- remove the ant.zip.prefix from the path when saving the .jar -->
47+
<globmapper from="${ant.zip.prefix}/*" to="*" />
48+
</mapper>
49+
</unzip>
50+
</sequential>
51+
</retry>
4852
<delete file="${ant.zip}" />
4953
</target>
5054

todo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1294 (4.3.1)
1+
1295 (4.3.2)
22
^^^^^^^^^^^^
33
NOTE: The first line in this file is the source for the current
44
revision of Processing for the build system.

0 commit comments

Comments
 (0)