summaryrefslogtreecommitdiffstats
path: root/devel/arduino18/files/patch-build_build.xml
blob: e5f7e674afbfb3fd1b2a281eee6cca2123210461 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
--- build/build.xml.orig	2017-03-16 17:38:01 UTC
+++ build/build.xml
@@ -100,7 +100,7 @@
   </fileset>
 
   <target name="build" description="Build Arduino.">
-    <antcall target="${platform}-build" />
+    <antcall target="linux64-build" />
 
     <antcall target="generate-hourly-build-txt"/>
   </target>
@@ -184,37 +184,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.0.zip" />
-      <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.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" />
@@ -239,6 +211,9 @@
     <download-library name="SD" version="1.1.1"/>
     <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
   </target>
+  <target name="assemble-libraries-light" if="light_bundle">
+    <mkdir dir="${target.path}/libraries" />
+  </target>
 
   <macrodef name="download-library">
     <attribute name="name"/>
@@ -257,13 +232,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  -->
@@ -638,53 +617,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">
OpenPOWER on IntegriCloud