Skip to content

Commit 42120a7

Browse files
committed
Support for building on 64-bit Linux.
Includes changes to the build.xml, 64-bit versions of avrdude and RXTX native libraries, and alternative versions of the RXTX jar and avrdude.conf for those 64-bit versions (because they also have other differences). (cherry picked from commit 253ab0c)
1 parent 5942806 commit 42120a7

File tree

5 files changed

+11938
-3
lines changed

5 files changed

+11938
-3
lines changed

app/lib/RXTXcomm-2.2.jar

59.4 KB
Binary file not shown.

build/build.xml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
<?xml version="1.0"?>
22
<project name="Arduino" default="build">
3+
<!--echo message="os.name = ${os.name}" /-->
4+
<!--echo message="os.arch = ${os.arch}" /-->
5+
<!--echo message="os.version = ${os.version}" /-->
36

47
<!-- Sets properties for macosx/windows/linux depending on current system -->
58
<condition property="macosx"><os family="mac" /></condition>
69
<condition property="windows"><os family="windows" /></condition>
710
<condition property="linux"><os family="unix" /></condition>
11+
<condition property="linux64"><os family="unix" arch="amd64" /></condition>
812

913
<condition property="platform"
1014
value="macosx"><os family="mac" /></condition>
1115
<condition property="platform"
1216
value="windows"><os family="windows" /></condition>
1317
<condition property="platform"
14-
value="linux"><os family="unix" /></condition>
18+
value="linux"><os family="unix" arch="i386" /></condition>
19+
<condition property="platform"
20+
value="linux64"><os family="unix" arch="amd64" /></condition>
1521

1622
<!-- Libraries required for running arduino -->
1723
<fileset dir=".." id="runtime.jars">
@@ -317,13 +323,25 @@
317323
<copy todir="linux/work" file="linux/dist/arduino" />
318324
<chmod perm="755" file="linux/work/arduino" />
319325
</target>
326+
327+
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
328+
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
329+
<copy tofile="linux/work/hardware/tools/avrdude.conf" file="linux/dist/tools/avrdude64.conf" overwrite="true" />
330+
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
331+
<copy tofile="linux/work/lib/RXTXcomm.jar" file="../app/lib/RXTXcomm-2.2.jar" overwrite="true" />
332+
</target>
320333

321334
<target name="linux-run" depends="linux-build"
322-
description="Run Linux version">
335+
description="Run Linux (32-bit) version">
323336
<exec executable="./linux/work/arduino" spawn="false"/>
324337
</target>
325338

326-
<target name="linux-dist" depends="linux-build"
339+
<target name="linux64-run" depends="linux64-build"
340+
description="Run Linux (64-bit) version">
341+
<exec executable="./linux/work/arduino" spawn="false"/>
342+
</target>
343+
344+
<target name="linux-dist" depends="build"
327345
description="Build .tar.gz of linux version">
328346

329347
<!--get src="http://dev.processing.org/build/jre-tools-6u18-linux-i586.tgz"
@@ -358,7 +376,10 @@
358376
=======================================================
359377
</echo>
360378
</target>
379+
361380

381+
<target name="linux64-dist" depends="linux-dist"
382+
description="Build .tar.gz of linux version" />
362383

363384
<!-- - - - - - - - -->
364385
<!-- Windows -->
59.8 KB
Binary file not shown.

build/linux/dist/tools/avrdude64

688 KB
Binary file not shown.

0 commit comments

Comments
 (0)