Skip to content

Commit 14a3dde

Browse files
cmaglieFederico Fissore
cmaglie
authored and
Federico Fissore
committed
IDE build.xml doesn't build hardware folder anymore.
Platforms are downloaded through "Boards installer"
1 parent 12a2d87 commit 14a3dde

File tree

7 files changed

+13
-127
lines changed

7 files changed

+13
-127
lines changed

Diff for: ‎build/build.xml

+13-113
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,6 @@
109109
<fileset dir="shared/tools" />
110110
</copy>
111111

112-
<!-- copy library folder -->
113-
<copy todir="${target.path}/libraries">
114-
<fileset dir="../libraries" />
115-
</copy>
116-
117-
<!-- copy hardware folder -->
118-
<copy todir="${target.path}/hardware">
119-
<fileset dir="../hardware">
120-
<exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/svd/"/>
121-
<exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/html/"/>
122-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M0*"/>
123-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M4*"/>
124-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M0*"/>
125-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M4*"/>
126-
</fileset>
127-
</copy>
128-
129112
<!-- copy shared examples folder -->
130113
<copy todir="${target.path}/examples">
131114
<fileset dir="shared/examples" />
@@ -141,8 +124,16 @@
141124

142125
<!-- Write the revision file! -->
143126
<echo file="${target.path}/lib/version.txt" message="${version}" />
127+
128+
<!-- copy library folder -->
129+
<antcall target="assemble-libraries" />
144130
</target>
145131

132+
<target name="assemble-libraries" if="bundle_libraries">
133+
<copy todir="${target.path}/libraries">
134+
<fileset dir="../libraries" />
135+
</copy>
136+
</target>
146137

147138
<!-- - - - - - - - - -->
148139
<!-- Revision check -->
@@ -209,6 +200,7 @@
209200

210201
<target name="macosx-old-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
211202
<mkdir dir="macosx/work" />
203+
<mkdir dir="macosx/work/${staging_hardware_folder}" />
212204

213205
<!-- assemble the pde -->
214206
<copy todir="macosx/work/Arduino.app">
@@ -246,6 +238,7 @@
246238
</antcall>
247239

248240
<mkdir dir="${staging_folder}/work" />
241+
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}" />
249242

250243
<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-upstream1/appbundler-1.0ea-upstream1.jar"/>
251244

@@ -316,38 +309,10 @@
316309

317310
<target name="macosx-build-common">
318311

319-
<!-- Unzip AVR tools -->
320-
<antcall target="unzip">
321-
<param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-3.4.5.zip" />
322-
<param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-mac32-3.4.5.zip" />
323-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
324-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
325-
</antcall>
326-
327-
<copy todir="macosx/work/${staging_hardware_folder}/tools/">
328-
<fileset file="macosx/dist/bossac" />
329-
</copy>
330-
331-
<chmod file="macosx/work/${staging_hardware_folder}/tools/bossac" perm="+x" />
332-
333312
<antcall target="assemble">
334313
<param name="target.path" value="macosx/work/${staging_hardware_folder}/../" />
335314
</antcall>
336315

337-
<antcall target="untar">
338-
<param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
339-
<param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
340-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
341-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
342-
</antcall>
343-
344-
<delete includeEmptyDirs="true" quiet="true">
345-
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/3.4.6/**/*"/>
346-
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/3.4.6"/>
347-
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man/**/*"/>
348-
<fileset dir="macosx/work/${staging_hardware_folder}/tools" includes="**/man"/>
349-
</delete>
350-
351316
<antcall target="unzip">
352317
<param name="archive_file" value="./libastylej-2.05.zip" />
353318
<param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
@@ -359,12 +324,6 @@
359324
<copy file="macosx/libastylej/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
360325
<chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
361326

362-
<chmod perm="+x">
363-
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/bin" includes="**/*" />
364-
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/avr/bin" includes="**/*" />
365-
<fileset dir="macosx/work/${staging_hardware_folder}/tools/avr/libexec/gcc/avr/4.8.1/" includes="*" />
366-
</chmod>
367-
368327
</target>
369328

370329
<target name="macosx-old-run" depends="macosx-old-build" description="Run Mac OS X version">
@@ -551,6 +510,7 @@
551510

552511
<target name="linux-build" depends="revision-check, linux-checkos, subprojects-build" description="Build linux version">
553512
<mkdir dir="linux/work" />
513+
<mkdir dir="linux/work/${staging_hardware_folder}" />
554514

555515
<copy todir="linux/work">
556516
<fileset dir="shared" includes="lib/**" />
@@ -572,15 +532,6 @@
572532
<copy todir="linux/work" file="linux/dist/arduino" />
573533
<chmod perm="755" file="linux/work/arduino" />
574534

575-
<mkdir dir="linux/work/hardware/tools" />
576-
<copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
577-
<copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
578-
<copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
579-
580-
<chmod perm="755" file="linux/work/hardware/tools/bossac" />
581-
<chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
582-
<chmod perm="755" file="linux/work/hardware/tools/adk2install" />
583-
584535
<copy todir="linux/work" file="linux/dist/arduino" />
585536
<chmod perm="755" file="linux/work/arduino" />
586537

@@ -595,39 +546,9 @@
595546
</target>
596547

597548
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
598-
<!-- Unzip ARM tools -->
599-
<antcall target="untar">
600-
<param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
601-
<param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
602-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
603-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
604-
</antcall>
605-
606-
<!-- Unzip AVR tools -->
607-
<antcall target="unzip">
608-
<param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-3.4.5.zip" />
609-
<param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux32-3.4.5.zip" />
610-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
611-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
612-
</antcall>
613549
</target>
614550

615551
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
616-
<!-- Unzip ARM tools -->
617-
<antcall target="untar">
618-
<param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
619-
<param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
620-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
621-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
622-
</antcall>
623-
624-
<!-- Unzip AVR tools -->
625-
<antcall target="unzip">
626-
<param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-3.4.5.zip" />
627-
<param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-linux64-3.4.5.zip" />
628-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
629-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
630-
</antcall>
631552
</target>
632553

633554
<target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
@@ -792,6 +713,7 @@
792713
depends="revision-check, windows-checkos, subprojects-build"
793714
description="Build windows version">
794715
<mkdir dir="windows/work" />
716+
<mkdir dir="windows/work/${staging_hardware_folder}" />
795717

796718
<!-- assemble the pde -->
797719
<mkdir dir="windows/work/lib" />
@@ -815,14 +737,6 @@
815737
<fileset dir="windows/dist" includes="drivers/**" />
816738
</copy>
817739

818-
<!-- Unzip AVR tools -->
819-
<antcall target="unzip">
820-
<param name="archive_file" value="${staging_folder}/avr-toolchain-win32-3.4.5-arduino1.zip" />
821-
<param name="archive_url" value="http://arduino.cc/download.php?f=/avr-toolchain-win32-3.4.5-arduino1.zip" />
822-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
823-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
824-
</antcall>
825-
826740
<antcall target="unzip">
827741
<param name="archive_file" value="./libastylej-2.05.zip" />
828742
<param name="archive_url" value="http://arduino.cc/download.php?f=/libastylej-2.05.zip" />
@@ -833,13 +747,11 @@
833747
<copy file="windows/msvcp100.dll" todir="windows/work" />
834748
<copy file="windows/msvcr100.dll" todir="windows/work" />
835749

836-
<!-- Copy bossac.exe tool -->
750+
<!-- Copy listComPort.exe tool -->
837751
<copy todir="windows/work/hardware/tools">
838-
<fileset file="windows/bossac.exe" />
839752
<fileset file="windows/listComPorts.exe" />
840753
</copy>
841754
<chmod perm="755">
842-
<fileset file="windows/work/hardware/tools/bossac.exe" />
843755
<fileset file="windows/work/hardware/tools/listComPorts.exe" />
844756
</chmod>
845757

@@ -868,18 +780,6 @@
868780
<chmod perm="755">
869781
<fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
870782
</chmod>
871-
872-
<!-- Unzip ARM toolchain -->
873-
<antcall target="untar">
874-
<param name="archive_file" value="${staging_folder}/dist/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
875-
<param name="archive_url" value="http://arduino.cc/download.php?f=/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
876-
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/gcc-arm-none-eabi-4.8.3-2014q1" />
877-
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/" />
878-
</antcall>
879-
880-
<delete includeEmptyDirs="true" quiet="true">
881-
<fileset dir="windows/work/hardware/tools/avr/doc" />
882-
</delete>
883783
</target>
884784

885785
<target name="windows-run" depends="windows-build"

Diff for: ‎build/linux/dist/tools/adk2install

-14
This file was deleted.

Diff for: ‎build/linux/dist/tools/adk2tool

-11.6 KB
Binary file not shown.

Diff for: ‎build/linux/dist/tools/bossac32

-380 KB
Binary file not shown.

Diff for: ‎build/linux/dist/tools/bossac64

-474 KB
Binary file not shown.

Diff for: ‎build/macosx/dist/bossac

-106 KB
Binary file not shown.

Diff for: ‎build/windows/bossac.exe

-805 KB
Binary file not shown.

0 commit comments

Comments
 (0)