Skip to content

Commit 838b52e

Browse files
cmagliecmaglie
committed
Factored out arduino-builder-build task in build.xml
This allows also conditional build of arduino-builder. See arduino#5438
1 parent a50a9c4 commit 838b52e

File tree

2 files changed

+22
-60
lines changed

2 files changed

+22
-60
lines changed

Diff for: ‎build/arduino-builder-arm-1.3.23.tar.bz2.sha renamed to ‎build/arduino-builder-linuxarm-1.3.23.tar.bz2.sha

File renamed without changes.

Diff for: ‎build/build.xml

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

475-
<delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
476-
<mkdir dir="${staging_folder}/arduino-builder-macosx"/>
477-
<antcall target="untar">
478-
<param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
479-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
480-
<param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
481-
<param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
482-
</antcall>
483-
<copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
484-
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
485-
<move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
486-
<copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
487-
<fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
488-
</copy>
489-
<delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
475+
<antcall target="build-arduino-builder" />
490476

491477
<antcall target="portable-${portable}">
492478
<param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
@@ -706,21 +692,7 @@
706692
<param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
707693
</antcall>
708694

709-
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
710-
<mkdir dir="${staging_folder}/arduino-builder-arm"/>
711-
<antcall target="untar">
712-
<param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
713-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
714-
<param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
715-
<param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
716-
</antcall>
717-
<copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
718-
<chmod perm="755" file="linux/work/arduino-builder" />
719-
<move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
720-
<copy todir="linux/work/hardware" overwrite="true">
721-
<fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
722-
</copy>
723-
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
695+
<antcall target="build-arduino-builder" />
724696

725697
<antcall target="avr-toolchain-bundle">
726698
<param name="unpack_target" value="untar"/>
@@ -738,21 +710,7 @@
738710
<param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
739711
</antcall>
740712

741-
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
742-
<mkdir dir="${staging_folder}/arduino-builder-linux32"/>
743-
<antcall target="untar">
744-
<param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
745-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
746-
<param name="final_folder" value="${staging_folder}/arduino-builder-linux32/arduino-builder" />
747-
<param name="dest_folder" value="${staging_folder}/arduino-builder-linux32" />
748-
</antcall>
749-
<copy file="${staging_folder}/arduino-builder-linux32/arduino-builder" tofile="linux/work/arduino-builder" />
750-
<chmod perm="755" file="linux/work/arduino-builder" />
751-
<move file="${staging_folder}/arduino-builder-linux32/tools" tofile="linux/work/tools-builder"/>
752-
<copy todir="linux/work/hardware" overwrite="true">
753-
<fileset dir="${staging_folder}/arduino-builder-linux32/hardware" includes="*.txt"/>
754-
</copy>
755-
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
713+
<antcall target="build-arduino-builder" />
756714

757715
<antcall target="avr-toolchain-bundle">
758716
<param name="unpack_target" value="untar"/>
@@ -770,21 +728,7 @@
770728
<param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
771729
</antcall>
772730

773-
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
774-
<mkdir dir="${staging_folder}/arduino-builder-linux64"/>
775-
<antcall target="untar">
776-
<param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
777-
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
778-
<param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
779-
<param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
780-
</antcall>
781-
<copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
782-
<chmod perm="755" file="linux/work/arduino-builder" />
783-
<move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
784-
<copy todir="linux/work/hardware" overwrite="true">
785-
<fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
786-
</copy>
787-
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
731+
<antcall target="build-arduino-builder" />
788732

789733
<antcall target="avr-toolchain-bundle">
790734
<param name="unpack_target" value="untar"/>
@@ -827,6 +771,24 @@
827771
<exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
828772
</target>
829773

774+
<target name="build-arduino-builder" unless="no_arduino_builder">
775+
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
776+
<mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
777+
<antcall target="untar">
778+
<param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
779+
<param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
780+
<param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
781+
<param name="dest_folder" value="${staging_folder}/arduino-builder-${platform}" />
782+
</antcall>
783+
<copy file="${staging_folder}/arduino-builder-${platform}/arduino-builder" tofile="${staging_folder}/work/${staging_hardware_folder}/../arduino-builder" />
784+
<chmod perm="755" file="${staging_folder}/work/${staging_hardware_folder}/../arduino-builder" />
785+
<move file="${staging_folder}/arduino-builder-${platform}/tools" tofile="${staging_folder}/work/${staging_hardware_folder}/../tools-builder"/>
786+
<copy todir="${staging_folder}/work/${staging_hardware_folder}" overwrite="true">
787+
<fileset dir="${staging_folder}/arduino-builder-${platform}/hardware" includes="*.txt"/>
788+
</copy>
789+
<delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
790+
</target>
791+
830792
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
831793
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
832794
<!-- hardware/tools/${dist_check_file} is checked for existence -->

0 commit comments

Comments
 (0)