rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

libastylej.zip now downloaded once for all archs and verified agains SHA checksum

Browse Source
This commit is contained in:
Federico Fissore 2014-10-07 13:02:18 +02:00
parent 70e4c35690
commit d757b67b9c
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,6 +13,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
hardware/arduino/bootloaders/caterina_LUFA/.dep/ hardware/arduino/bootloaders/caterina_LUFA/.dep/
build/libastylej-*.zip
build/windows/work/ build/windows/work/
build/windows/jre.zip build/windows/jre.zip
build/windows/libastylej* build/windows/libastylej*

23
build/build.xml
View File

@ -265,8 +265,7 @@
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/> <fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
</delete> </delete>
<get src="http://downloads.arduino.cc/libastylej-2.04.zip" dest="macosx" usetimestamp="true" skipexisting="true"/> <antcall target="unzip-libastyle" />
<unzip src="macosx/libastylej-2.04.zip" dest="macosx" overwrite="true"/>
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Resources/Java/lib/" /> <copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Resources/Java/lib/" />
<chmod perm="755" file="macosx/work/Arduino.app/Contents/Resources/Java/lib/libastylej.jnilib" /> <chmod perm="755" file="macosx/work/Arduino.app/Contents/Resources/Java/lib/libastylej.jnilib" />
</target> </target>
@ -480,8 +479,7 @@
<copy todir="linux/work" file="linux/dist/arduino" /> <copy todir="linux/work" file="linux/dist/arduino" />
<chmod perm="755" file="linux/work/arduino" /> <chmod perm="755" file="linux/work/arduino" />
<get src="http://downloads.arduino.cc/libastylej-2.04.zip" dest="linux" usetimestamp="true" skipexisting="true" /> <antcall target="unzip-libastyle" />
<unzip src="linux/libastylej-2.04.zip" dest="linux" overwrite="true"/>
<copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" /> <copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
<chmod perm="755" file="linux/work/lib/libastylej.so" /> <chmod perm="755" file="linux/work/lib/libastylej.so" />
</target> </target>
@ -545,7 +543,21 @@
</exec> </exec>
</target> </target>
<target name="unzip-libastyle">
<get src="http://downloads.arduino.cc/libastylej-2.04.zip" dest="." usetimestamp="true" ignoreerrors="true" verbose="true" />
<checksum file="libastylej-2.04.zip" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
<condition property="checksum.matches.fail">
<equals arg1="${checksum.matches}" arg2="false"/>
</condition>
<fail if="checksum.matches.fail">Checksum failed.
File libastylej-2.04.zip failed checksum.
Please remove "libastylej-2.04.zip" and download it again.
</fail>
<unzip src="libastylej-2.04.zip" dest="${staging_folder}" overwrite="true"/>
</target>
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded --> <!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory --> <!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
@ -741,8 +753,7 @@
<param name="file_arch" value="win32" /> <param name="file_arch" value="win32" />
</antcall> </antcall>
<get src="http://downloads.arduino.cc/libastylej-2.04.zip" dest="windows" usetimestamp="true" skipexisting="true" /> <antcall target="unzip-libastyle" />
<unzip src="windows/libastylej-2.04.zip" dest="windows" overwrite="true"/>
<copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" /> <copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
<!-- Copy bossac.exe tool --> <!-- Copy bossac.exe tool -->

1
build/libastylej-2.04.zip.sha Normal file
View File

@ -0,0 +1 @@
46097a6689ff4b5c7a5def5427185f11f6e5dd2a