Skip to content

Commit ba36769

Browse files
committed
Merge pull request #2710 from ffissore/windows-jre-update
Windows: bundled JRE updated to 8u31
2 parents cd04958 + 304c05d commit ba36769

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

build/build.xml

+6-13
Original file line numberDiff line numberDiff line change
@@ -888,19 +888,12 @@
888888
<target name="windows-dist" depends="windows-build"
889889
description="Create .zip files of windows version">
890890

891-
<get src="http://arduino.cc/download.php?f=/jre_7u40_windows_i586.zip" dest="windows/jre.zip" usetimestamp="true" skipexisting="true" />
892-
893-
<unzip dest="windows/work" src="windows/jre.zip" overwrite="false"/>
894-
895-
<!--
896-
<zip basedir="windows/work"
897-
prefix="arduino-${version}"
898-
destfile="windows/arduino-${version}.zip" />
899-
<zip basedir="windows/work"
900-
prefix="arduino-${version}"
901-
destfile="windows/arduino-${version}-expert.zip"
902-
excludes="java/**" />
903-
-->
891+
<antcall target="unzip">
892+
<param name="archive_file" value="windows/jre-8u31.zip" />
893+
<param name="archive_url" value="http://arduino.cc/download.php?f=/jre-8u31.zip" />
894+
<param name="final_folder" value="${staging_folder}/work/java" />
895+
<param name="dest_folder" value="${staging_folder}/work/" />
896+
</antcall>
904897

905898
<zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
906899
<zipfileset dir="windows/work"

build/windows/jre-8u31.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
17bf4f25babaf70bdb68fd3464be163eb769c074

0 commit comments

Comments
 (0)