Skip to content

Commit

Permalink
Merge pull request #885 from processing/fix-ant-download-4
Browse files Browse the repository at this point in the history
Retry the failing ant download at least a few times
  • Loading branch information
SableRaf authored Dec 13, 2024
2 parents 252e46f + a6ef5eb commit 2a97f64
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
38 changes: 21 additions & 17 deletions app/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,27 @@
</condition>

<target name="download-ant" unless="ant.present">
<get src="${ant.url}" dest="${ant.zip}"
ignoreerrors="${ant.ignorable}"
usetimestamp="true" />

<property name="ant.zip.prefix" value="apache-ant-${ant.version.num}/lib" />

<unzip src="${ant.zip}" dest="lib">
<patternset>
<!-- unzip a single jar from the ant.zip.prefix subdirectory in the .zip -->
<include name="${ant.zip.prefix}/ant.jar" />
<include name="${ant.zip.prefix}/ant-launcher.jar" />
</patternset>
<mapper>
<!-- remove the ant.zip.prefix from the path when saving the .jar -->
<globmapper from="${ant.zip.prefix}/*" to="*" />
</mapper>
</unzip>
<retry retrycount="5" retrydelay="10000">
<sequential>
<get src="${ant.url}" dest="${ant.zip}"
ignoreerrors="${ant.ignorable}"
usetimestamp="true" />

<property name="ant.zip.prefix" value="apache-ant-${ant.version.num}/lib" />

<unzip src="${ant.zip}" dest="lib">
<patternset>
<!-- unzip a single jar from the ant.zip.prefix subdirectory in the .zip -->
<include name="${ant.zip.prefix}/ant.jar" />
<include name="${ant.zip.prefix}/ant-launcher.jar" />
</patternset>
<mapper>
<!-- remove the ant.zip.prefix from the path when saving the .jar -->
<globmapper from="${ant.zip.prefix}/*" to="*" />
</mapper>
</unzip>
</sequential>
</retry>
<delete file="${ant.zip}" />
</target>

Expand Down
2 changes: 1 addition & 1 deletion todo.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
1294 (4.3.1)
1295 (4.3.2)
^^^^^^^^^^^^
NOTE: The first line in this file is the source for the current
revision of Processing for the build system.
Expand Down

0 comments on commit 2a97f64

Please sign in to comment.