mirror of
https://github.com/arduino/Arduino.git
synced 2025-02-19 13:54:23 +01:00
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).
This commit is contained in:
parent
40d2c3db0b
commit
253ab0cace
BIN
app/lib/RXTXcomm-2.2.jar
Normal file
BIN
app/lib/RXTXcomm-2.2.jar
Normal file
Binary file not shown.
@ -1,17 +1,23 @@
|
||||
<?xml version="1.0"?>
|
||||
<project name="Arduino" default="build">
|
||||
<!--echo message="os.name = ${os.name}" /-->
|
||||
<!--echo message="os.arch = ${os.arch}" /-->
|
||||
<!--echo message="os.version = ${os.version}" /-->
|
||||
|
||||
<!-- Sets properties for macosx/windows/linux depending on current system -->
|
||||
<condition property="macosx"><os family="mac" /></condition>
|
||||
<condition property="windows"><os family="windows" /></condition>
|
||||
<condition property="linux"><os family="unix" /></condition>
|
||||
<condition property="linux64"><os family="unix" arch="amd64" /></condition>
|
||||
|
||||
<condition property="platform"
|
||||
value="macosx"><os family="mac" /></condition>
|
||||
<condition property="platform"
|
||||
value="windows"><os family="windows" /></condition>
|
||||
<condition property="platform"
|
||||
value="linux"><os family="unix" /></condition>
|
||||
value="linux"><os family="unix" arch="i386" /></condition>
|
||||
<condition property="platform"
|
||||
value="linux64"><os family="unix" arch="amd64" /></condition>
|
||||
|
||||
<!-- Libraries required for running arduino -->
|
||||
<fileset dir=".." id="runtime.jars">
|
||||
@ -317,13 +323,25 @@
|
||||
<copy todir="linux/work" file="linux/dist/arduino" />
|
||||
<chmod perm="755" file="linux/work/arduino" />
|
||||
</target>
|
||||
|
||||
<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.conf" file="linux/dist/tools/avrdude64.conf" overwrite="true" />
|
||||
<copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
|
||||
<copy tofile="linux/work/lib/RXTXcomm.jar" file="../app/lib/RXTXcomm-2.2.jar" overwrite="true" />
|
||||
</target>
|
||||
|
||||
<target name="linux-run" depends="linux-build"
|
||||
description="Run Linux version">
|
||||
description="Run Linux (32-bit) version">
|
||||
<exec executable="./linux/work/arduino" spawn="false"/>
|
||||
</target>
|
||||
|
||||
<target name="linux-dist" depends="linux-build"
|
||||
<target name="linux64-run" depends="linux64-build"
|
||||
description="Run Linux (64-bit) version">
|
||||
<exec executable="./linux/work/arduino" spawn="false"/>
|
||||
</target>
|
||||
|
||||
<target name="linux-dist" depends="build"
|
||||
description="Build .tar.gz of linux version">
|
||||
|
||||
<!--get src="http://dev.processing.org/build/jre-tools-6u18-linux-i586.tgz"
|
||||
@ -358,7 +376,10 @@
|
||||
=======================================================
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="linux64-dist" depends="linux-dist"
|
||||
description="Build .tar.gz of linux version" />
|
||||
|
||||
<!-- - - - - - - - -->
|
||||
<!-- Windows -->
|
||||
|
BIN
build/linux/dist/lib/librxtxSerial64.so
vendored
Executable file
BIN
build/linux/dist/lib/librxtxSerial64.so
vendored
Executable file
Binary file not shown.
BIN
build/linux/dist/tools/avrdude64
vendored
Executable file
BIN
build/linux/dist/tools/avrdude64
vendored
Executable file
Binary file not shown.
11914
build/linux/dist/tools/avrdude64.conf
vendored
Normal file
11914
build/linux/dist/tools/avrdude64.conf
vendored
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user