Skip to content

Commit 60ca108

Browse files
Make installing toolchains and native libraries optional
If you pass -Dinstall_toolchains=false or -Dinstall_native_libs=false to the ant command, the toolchains or native libraries will not be installed into the build/work directory, making the IDE fall back on the system versions instead. This is intended for advanced users who run from git and want to use their system toolchain or libraries. These toolchain-less installs are not intended to be distributed as tarballs.
1 parent 9498518 commit 60ca108

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

build/build.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
2727
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
2828
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
29+
<!-- Define these to false skip installing the toolchains and native
30+
libraries. E.g., run ant -Dinstall_toolchains=false -->
31+
<property name="install_toolchains" value="true" />
32+
<property name="install_native_libs" value="true" />
2933

3034
<condition property="arch-bits" value="32">
3135
<equals arg1="${platform}" arg2="linux32"/>
@@ -227,7 +231,7 @@
227231
</antcall>
228232
</target>
229233

230-
<target name="macosx-toolchains">
234+
<target name="macosx-toolchains" if="${install_toolchains}">
231235
<exec executable="unzip">
232236
<arg value="-q" />
233237
<arg value="-n" />
@@ -260,7 +264,7 @@
260264
</delete>
261265
</target>
262266

263-
<target name="macosx-native-libs">
267+
<target name="macosx-native-libs" if="${install_native_libs}">
264268
<get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="macosx" usetimestamp="true" />
265269
<unzip src="macosx/libastylej-2.03.zip" dest="macosx" overwrite="true"/>
266270
<copy file="macosx/libastylej/libastylej.jnilib" todir="macosx/work/Arduino.app/Contents/Resources/Java/lib/" />
@@ -463,7 +467,7 @@
463467
<chmod perm="755" file="linux/work/arduino" />
464468
</target>
465469

466-
<target name="linux-native-libs">
470+
<target name="linux-native-libs" if="${install_native_libs}">
467471
<get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="linux" usetimestamp="true" />
468472
<unzip src="linux/libastylej-2.03.zip" dest="linux" overwrite="true"/>
469473
<copy file="linux/libastylej/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
@@ -476,7 +480,7 @@
476480
<target name="linux64-build" depends="linux-build, linux64-toolchains, linux-native-libs"
477481
description="Build linux (64-bit) version" />
478482

479-
<target name="linux-toolchains">
483+
<target name="linux-toolchains" if="${install_toolchains}">
480484
<mkdir dir="linux/work/hardware/tools" />
481485
<copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
482486
<copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
@@ -490,7 +494,7 @@
490494
<chmod perm="755" file="linux/work/hardware/tools/adk2install" />
491495
</target>
492496

493-
<target name="linux32-toolchains" depends="linux-toolchains">
497+
<target name="linux32-toolchains" depends="linux-toolchains" if="${install_toolchains}">
494498
<!-- Unzip ARM tools -->
495499
<antcall target="unzip-arm-toolchain">
496500
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
@@ -505,7 +509,7 @@
505509
</exec>
506510
</target>
507511

508-
<target name="linux64-toolchains" depends="linux-toolchains">
512+
<target name="linux64-toolchains" depends="linux-toolchains" if="${install_toolchains}">
509513
<!-- Unzip ARM tools -->
510514
<antcall target="unzip-arm-toolchain">
511515
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
@@ -689,13 +693,13 @@
689693
</chmod>
690694
</target>
691695

692-
<target name="windows-native-libs">
696+
<target name="windows-native-libs" if="${install_native_libs}">
693697
<get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="windows" usetimestamp="true" />
694698
<unzip src="windows/libastylej-2.03.zip" dest="windows" overwrite="true"/>
695699
<copy file="windows/libastylej/AStylej.dll" todir="windows/work/lib" />
696700
</target>
697701

698-
<target name="windows-toolchains">
702+
<target name="windows-toolchains" if="${install_toolchains}">
699703
<!-- Unzip AVR tools -->
700704
<get src="http://downloads.arduino.cc/WinAVR-20081205-arduino-2.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
701705
<unzip dest="windows/work/hardware" src="windows/WinAVR-20081205-arduino-2.zip" overwrite="false"/>

0 commit comments

Comments
 (0)