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

Fixing build on 64-bit linux.

Browse Source
This commit is contained in:
David A. Mellis 2012-02-29 16:16:37 -05:00
parent de8c051f38
commit c5c41bc531
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build/build.xml
View File

@ -341,18 +341,18 @@
<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" file="linux/dist/arduino" />
<chmod perm="755" file="linux/work/arduino" />
<copy todir="linux/work/hardware"> <copy todir="linux/work/hardware">
<fileset dir="linux/dist" includes="tools/**" /> <fileset dir="linux/dist" includes="tools/**" />
</copy> </copy>
<chmod perm="755" file="linux/work/hardware/tools/avrdude" /> <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
</target>
<copy todir="linux/work" file="linux/dist/arduino" /> <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
<chmod perm="755" file="linux/work/arduino" />
<!-- 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">
@ -362,12 +362,15 @@
</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" /> <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" /> <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
<!-- Unzip AVR tools --> <!-- Unzip AVR tools -->
<bunzip2 dest="linux" src="linux/avr_tools_linux64.tar.bz2" /> <bunzip2 dest="linux" src="linux/avr_tools_linux64.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_linux64.tar"/> <arg value="../../avr_tools_linux64.tar"/>
</exec> </exec>
</target> </target>