Skip to content

Commit f2c0198

Browse files
author
Federico Fissore
committed
Revert "Revert "avrdude -> avrdude32""
This reverts commit b0332f0.
1 parent 6ab9299 commit f2c0198

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

build/build.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
<condition property="platform"
2121
value="linux64"><os family="unix" arch="amd64" /></condition>
2222

23+
<condition property="arch-bits" value="32">
24+
<equals arg1="${platform}" arg2="linux32"/>
25+
</condition>
26+
<condition property="arch-bits" value="64">
27+
<equals arg1="${platform}" arg2="linux64"/>
28+
</condition>
29+
2330
<!-- Libraries required for running arduino -->
2431
<fileset dir=".." id="runtime.jars">
2532
<include name="core/core.jar" />
@@ -463,13 +470,15 @@
463470
<copy todir="linux/work" file="linux/dist/arduino" />
464471
<chmod perm="755" file="linux/work/arduino" />
465472

466-
<copy todir="linux/work/hardware">
467-
<fileset dir="linux/dist" includes="tools/**" />
468-
</copy>
473+
<mkdir dir="linux/work/hardware/tools" />
474+
<copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
475+
<copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
476+
<copy file="linux/dist/tools/avrdude${arch-bits}" tofile="linux/work/hardware/tools/avrdude" />
477+
<copy file="linux/dist/tools/avrdude.conf" todir="linux/work/hardware/tools" />
478+
<copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
469479

470480
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
471481
<chmod perm="755" file="linux/work/hardware/tools/bossac" />
472-
<chmod perm="755" file="linux/work/hardware/tools/bossac64" />
473482
<chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
474483
<chmod perm="755" file="linux/work/hardware/tools/adk2install" />
475484

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)