Skip to content

Commit b0332f0

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

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

build/build.xml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@
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-
3023
<!-- Libraries required for running arduino -->
3124
<fileset dir=".." id="runtime.jars">
3225
<include name="core/core.jar" />
@@ -470,15 +463,13 @@
470463
<copy todir="linux/work" file="linux/dist/arduino" />
471464
<chmod perm="755" file="linux/work/arduino" />
472465

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" />
466+
<copy todir="linux/work/hardware">
467+
<fileset dir="linux/dist" includes="tools/**" />
468+
</copy>
479469

480470
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
481471
<chmod perm="755" file="linux/work/hardware/tools/bossac" />
472+
<chmod perm="755" file="linux/work/hardware/tools/bossac64" />
482473
<chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
483474
<chmod perm="755" file="linux/work/hardware/tools/adk2install" />
484475

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)