rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

Cleaning up Linux build (32 vs. 64-bit, dist).

Browse Source
This commit is contained in:
David A. Mellis 2012-02-29 15:30:03 -05:00
parent 4805395bb0
commit c128aac761
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build/build.xml
View File

@ -8,6 +8,7 @@
<condition property="macosx"><os family="mac" /></condition> <condition property="macosx"><os family="mac" /></condition>
<condition property="windows"><os family="windows" /></condition> <condition property="windows"><os family="windows" /></condition>
<condition property="linux"><os family="unix" /></condition> <condition property="linux"><os family="unix" /></condition>
<condition property="linux32"><os family="unix" arch="i386" /></condition>
<condition property="linux64"><os family="unix" arch="amd64" /></condition> <condition property="linux64"><os family="unix" arch="amd64" /></condition>
<condition property="platform" <condition property="platform"
@ -15,7 +16,7 @@
<condition property="platform" <condition property="platform"
value="windows"><os family="windows" /></condition> value="windows"><os family="windows" /></condition>
<condition property="platform" <condition property="platform"
value="linux"><os family="unix" arch="i386" /></condition> value="linux32"><os family="unix" arch="i386" /></condition>
<condition property="platform" <condition property="platform"
value="linux64"><os family="unix" arch="amd64" /></condition> value="linux64"><os family="unix" arch="amd64" /></condition>
@ -340,7 +341,9 @@
<antcall target="assemble"> <antcall target="assemble">
<param name="target.path" value="linux/work" /> <param name="target.path" value="linux/work" />
</antcall> </antcall>
</target>
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
<copy todir="linux/work/hardware"> <copy todir="linux/work/hardware">
<fileset dir="linux/dist" includes="tools/**" /> <fileset dir="linux/dist" includes="tools/**" />
</copy> </copy>
@ -353,17 +356,17 @@
<!-- Unzip AVR tools --> <!-- Unzip AVR tools -->
<bunzip2 dest="linux" src="linux/avr_tools_linux32.tar.bz2" /> <bunzip2 dest="linux" src="linux/avr_tools_linux32.tar.bz2" />
<exec executable="tar" dir="linux/work/hardware"> <exec executable="tar" dir="linux/work/hardware">
<arg value="-xvf"/> <arg value="-xf"/>
<arg value="../../avr_tools_linux32.tar"/> <arg value="../../avr_tools_linux32.tar"/>
</exec> </exec>
</target> </target>
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version"> <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" /> <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" />
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" />
</target> </target>
<target name="linux-run" depends="linux-build" <target name="linux32-run" depends="linux32-build"
description="Run Linux (32-bit) version"> description="Run Linux (32-bit) version">
<exec executable="./linux/work/arduino" spawn="false"/> <exec executable="./linux/work/arduino" spawn="false"/>
</target> </target>
@ -387,7 +390,7 @@
<!-- <!--
<tar compression="gzip" basedir="linux/work" <tar compression="gzip" basedir="linux/work"
destfile="linux/arduino-${version}.tgz" /> destfile="linux/arduino-${version}.tgz" />
-->
<tar compression="gzip" destfile="linux/arduino-${version}-linux.tgz"> <tar compression="gzip" destfile="linux/arduino-${version}-linux.tgz">
<tarfileset dir="linux/work" <tarfileset dir="linux/work"
prefix="arduino-${version}" prefix="arduino-${version}"
@ -399,6 +402,18 @@
<tarfileset file="linux/work/hardware/tools/avrdude" filemode="755" <tarfileset file="linux/work/hardware/tools/avrdude" filemode="755"
prefix="arduino-${version}/hardware/tools" /> prefix="arduino-${version}/hardware/tools" />
</tar> </tar>
-->
<move file="linux/work" tofile="linux/arduino-${version}" />
<exec executable="tar" dir="linux">
<arg value="-z"/>
<arg value="-c"/>
<arg value="-f"/>
<arg value="arduino-${version}-linux.tgz"/>
<arg value="arduino-${version}"/>
</exec>
<move file="linux/arduino-${version}" tofile="linux/work" />
<echo> <echo>
======================================================= =======================================================
@ -409,6 +424,8 @@
</echo> </echo>
</target> </target>
<target name="linux32-dist" depends="linux-dist"
description="Build .tar.gz of linux version" />
<target name="linux64-dist" depends="linux-dist" <target name="linux64-dist" depends="linux-dist"
description="Build .tar.gz of linux version" /> description="Build .tar.gz of linux version" />