1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-06 01:08:25 +01:00

ant clean now removes tgz/zip

linux tgz renamed to linux32 and linux64
This commit is contained in:
Federico Fissore 2013-01-31 12:32:29 +01:00
parent bd66184e29
commit 3f105bcd00

View File

@ -150,6 +150,9 @@
<delete dir="macosx/working_dir" /> <delete dir="macosx/working_dir" />
<delete dir="macosx/working.dmg" /> <delete dir="macosx/working.dmg" />
<delete file="macosx/arduino-*.dmg" /> <delete file="macosx/arduino-*.dmg" />
<delete>
<fileset dir="macosx" includes="arduino-*macosx*.zip"/>
</delete>
</target> </target>
<target name="macosx-checkos" unless="macosx"> <target name="macosx-checkos" unless="macosx">
@ -277,7 +280,7 @@
token="REVISION" value="${revision}" /> token="REVISION" value="${revision}" />
<exec executable="zip" dir="macosx/work"> <exec executable="zip" dir="macosx/work">
<arg line="-q -r ../arduino-${version}-macosx.zip ." /> <arg line="-q -r ../arduino-${version}-${platform}.zip ." />
</exec> </exec>
<!-- <exec executable="ditto" dir="macosx/work"> <!-- <exec executable="ditto" dir="macosx/work">
<arg line="-c -k -rsrc . ../arduino-${version}-macosx.zip" /> <arg line="-c -k -rsrc . ../arduino-${version}-macosx.zip" />
@ -287,7 +290,7 @@
======================================================= =======================================================
Arduino for Mac OS X was built. Grab the image from Arduino for Mac OS X was built. Grab the image from
macosx/arduino-${version}-macosx.zip macosx/arduino-${version}-${platform}.zip
======================================================= =======================================================
</echo> </echo>
</target> </target>
@ -352,6 +355,9 @@
<target name="linux-clean" depends="subprojects-clean" description="Clean linux version"> <target name="linux-clean" depends="subprojects-clean" description="Clean linux version">
<delete dir="linux/work" /> <delete dir="linux/work" />
<delete>
<fileset dir="linux" includes="arduino-*linux*.tgz"/>
</delete>
</target> </target>
<target name="linux-checkos" unless="linux"> <target name="linux-checkos" unless="linux">
@ -513,7 +519,7 @@
<arg value="-z"/> <arg value="-z"/>
<arg value="-c"/> <arg value="-c"/>
<arg value="-f"/> <arg value="-f"/>
<arg value="arduino-${version}-linux.tgz"/> <arg value="arduino-${version}-${platform}.tgz"/>
<arg value="arduino-${version}"/> <arg value="arduino-${version}"/>
</exec> </exec>
@ -523,7 +529,7 @@
======================================================= =======================================================
Arduino for Linux was built. Grab the archive from Arduino for Linux was built. Grab the archive from
build/linux/arduino-${version}-linux.tgz build/linux/arduino-${version}-${platform}.tgz
======================================================= =======================================================
</echo> </echo>
</target> </target>
@ -541,6 +547,9 @@
<target name="windows-clean" depends="subprojects-clean" <target name="windows-clean" depends="subprojects-clean"
description="Clean windows version"> description="Clean windows version">
<delete dir="windows/work" /> <delete dir="windows/work" />
<delete>
<fileset dir="windows" includes="arduino-*windows*.zip"/>
</delete>
</target> </target>
<target name="windows-checkos" unless="windows"> <target name="windows-checkos" unless="windows">
@ -680,12 +689,12 @@
excludes="java/**" /> excludes="java/**" />
--> -->
<zip destfile="windows/arduino-${version}-windows.zip"> <zip destfile="windows/arduino-${version}-${platform}.zip">
<zipfileset dir="windows/work" <zipfileset dir="windows/work"
prefix="arduino-${version}" /> prefix="arduino-${version}" />
</zip> </zip>
<zip destfile="windows/arduino-${version}-windows-expert.zip"> <zip destfile="windows/arduino-${version}-${platform}-expert.zip">
<zipfileset dir="windows/work" <zipfileset dir="windows/work"
prefix="arduino-${version}" prefix="arduino-${version}"
excludes="java/**" /> excludes="java/**" />
@ -695,8 +704,8 @@
======================================================= =======================================================
Arduino for Windows was built. Grab the archive from Arduino for Windows was built. Grab the archive from
windows/arduino-${version}-windows.zip windows/arduino-${version}-${platform}.zip
windows/arduino-${version}-windows-expert.zip windows/arduino-${version}-${platform}-expert.zip
======================================================= =======================================================
</echo> </echo>
</target> </target>