--- build/build.xml.orig 2017-09-28 14:43:01 UTC
+++ build/build.xml
@@ -102,7 +102,7 @@
</fileset>
<target name="build" description="Build Arduino.">
- <antcall target="${platform}-build" />
+ <antcall target="linux64-build" />
<antcall target="generate-hourly-build-txt"/>
</target>
@@ -186,37 +186,9 @@
<echo file="${target.path}/lib/version.txt" message="${version}" />
<antcall target="assemble-libraries" />
-
- <!-- Add WiFi101 updater tool -->
- <antcall target="unzip">
- <param name="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" />
- <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" />
- <param name="final_folder" value="${target.path}/tools/WiFi101" />
- <param name="dest_folder" value="${target.path}/tools/" />
- </antcall>
</target>
<target name="assemble-docs" unless="no_docs">
- <!-- Unzip documentation -->
- <antcall target="unzip">
- <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/reference-1.6.6-3.zip" />
- <param name="final_folder" value="${target.path}/reference/www.arduino.cc" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
- <antcall target="unzip">
- <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" />
- <param name="final_folder" value="${target.path}/reference/Galileo_help_files" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
- <antcall target="unzip">
- <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
- <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
-
<!-- Fix wrong permissions from zip file root folder -->
<chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
<chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
@@ -243,6 +215,9 @@
<download-library name="LiquidCrystal" version="1.0.7"/>
<download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.8" foldername="Adafruit_Circuit_Playground"/>
</target>
+ <target name="assemble-libraries-light" if="light_bundle">
+ <mkdir dir="${target.path}/libraries" />
+ </target>
<macrodef name="download-library">
<attribute name="name"/>
@@ -262,13 +237,17 @@
</macrodef>
<!-- copy hardware folder -->
- <target name="assemble-hardware" unless="light_bundle">
+ <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" />
+ <target name="assemble-hardware-full" unless="light_bundle">
<copy todir="${target.path}/hardware">
<fileset dir="../hardware">
<exclude name="arduino/sam/**"/>
</fileset>
</copy>
</target>
+ <target name="assemble-hardware-light" if="light_bundle">
+ <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" />
+ </target>
<!-- - - - - - - - - -->
<!-- Revision check -->
@@ -642,53 +621,15 @@
</target>
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
- <chmod perm="755" file="linux/work/lib/libastylej.so" />
-
<antcall target="portable-${portable}">
<param name="parentdir" value="linux/work" />
</antcall>
-
- <antcall target="unzip">
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
-
</target>
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
- <chmod perm="755" file="linux/work/lib/libastylej.so" />
-
<antcall target="portable-${portable}">
<param name="parentdir" value="linux/work" />
</antcall>
-
- <antcall target="unzip">
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="linux/liblistSerials-${LIBLISTSERIAL-VERSION}/arm/liblistSerialsj.so" todir="linux/work/lib/" />
- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
-
</target>
<target name="linuxarm-build" depends="linux-libastyle-arm" description="Build linux (32-bit) version">