Skip to content

Commit f29abf8

Browse files
NicoHoodNicoHood
committed
Added build option for disabling arduino-builder
1 parent 11e8091 commit f29abf8

File tree

1 file changed

+22
-60
lines changed

1 file changed

+22
-60
lines changed

Diff for: ‎build/build.xml

+22-60
Original file line numberDiff line numberDiff line change
@@ -480,21 +480,7 @@
480480
<copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
481481
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
482482

483-
<delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
484-
<mkdir dir="${staging_folder}/arduino-builder-macosx"/>
485-
<antcall target="untar">
486-
<param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
487-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
488-
<param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
489-
<param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
490-
</antcall>
491-
<copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
492-
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
493-
<move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
494-
<copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
495-
<fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
496-
</copy>
497-
<delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
483+
<antcall target="build-arduino-builder" />
498484

499485
<antcall target="portable-${portable}">
500486
<param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@@ -714,21 +700,7 @@
714700
<param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
715701
</antcall>
716702

717-
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
718-
<mkdir dir="${staging_folder}/arduino-builder-arm"/>
719-
<antcall target="untar">
720-
<param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
721-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
722-
<param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
723-
<param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
724-
</antcall>
725-
<copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
726-
<chmod perm="755" file="linux/work/arduino-builder" />
727-
<move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
728-
<copy todir="linux/work/hardware" overwrite="true">
729-
<fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
730-
</copy>
731-
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
703+
<antcall target="build-arduino-builder" />
732704

733705
<antcall target="avr-toolchain-bundle">
734706
<param name="unpack_target" value="untar"/>
@@ -746,21 +718,7 @@
746718
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
747719
</antcall>
748720

749-
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
750-
<mkdir dir="${staging_folder}/arduino-builder-linux32"/>
751-
<antcall target="untar">
752-
<param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
753-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
754-
<param name="final_folder" value="${staging_folder}/arduino-builder-linux32/arduino-builder" />
755-
<param name="dest_folder" value="${staging_folder}/arduino-builder-linux32" />
756-
</antcall>
757-
<copy file="${staging_folder}/arduino-builder-linux32/arduino-builder" tofile="linux/work/arduino-builder" />
758-
<chmod perm="755" file="linux/work/arduino-builder" />
759-
<move file="${staging_folder}/arduino-builder-linux32/tools" tofile="linux/work/tools-builder"/>
760-
<copy todir="linux/work/hardware" overwrite="true">
761-
<fileset dir="${staging_folder}/arduino-builder-linux32/hardware" includes="*.txt"/>
762-
</copy>
763-
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
721+
<antcall target="build-arduino-builder" />
764722

765723
<antcall target="avr-toolchain-bundle">
766724
<param name="unpack_target" value="untar"/>
@@ -778,21 +736,7 @@
778736
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
779737
</antcall>
780738

781-
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
782-
<mkdir dir="${staging_folder}/arduino-builder-linux64"/>
783-
<antcall target="untar">
784-
<param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
785-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
786-
<param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
787-
<param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
788-
</antcall>
789-
<copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
790-
<chmod perm="755" file="linux/work/arduino-builder" />
791-
<move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
792-
<copy todir="linux/work/hardware" overwrite="true">
793-
<fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
794-
</copy>
795-
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
739+
<antcall target="build-arduino-builder" />
796740

797741
<antcall target="avr-toolchain-bundle">
798742
<param name="unpack_target" value="untar"/>
@@ -835,6 +779,24 @@
835779
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
836780
</target>
837781

782+
<target name="build-arduino-builder" unless="no_arduino_builder">
783+
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
784+
<mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
785+
<antcall target="untar">
786+
<param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
787+
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
788+
<param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
789+
<param name="dest_folder" value="${staging_folder}/arduino-builder-${platform}" />
790+
</antcall>
791+
<copy file="${staging_folder}/arduino-builder-${platform}/arduino-builder" tofile="linux/work/arduino-builder" />
792+
<chmod perm="755" file="linux/work/arduino-builder" />
793+
<move file="${staging_folder}/arduino-builder-${platform}/tools" tofile="linux/work/tools-builder"/>
794+
<copy todir="linux/work/hardware" overwrite="true">
795+
<fileset dir="${staging_folder}/arduino-builder-${platform}/hardware" includes="*.txt"/>
796+
</copy>
797+
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
798+
</target>
799+
838800
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
839801
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
840802
<!-- hardware/tools/${dist_check_file} is checked for existence -->

0 commit comments

Comments
 (0)