Skip to content

Commit b1e2e89

Browse files
facchinmfacchinm
committed
Improve packager script
1 parent 98a1a71 commit b1e2e89

File tree

4 files changed

+238
-11
lines changed

4 files changed

+238
-11
lines changed

‎extras/package_index.json.NewTag.template‎

Lines changed: 197 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"packages": [
33
{
44
"name": "arduino",
5-
"maintainer": "Arduino Betatesting",
5+
"maintainer": "Arduino",
66
"websiteURL": "http://www.arduino.cc/",
77
"email": "packages@arduino.cc",
88
"help": {
99
"online": "http://www.arduino.cc/en/Reference/HomePage"
1010
},
1111
"platforms": [
1212
{
13-
"name": "Arduino mbed-enabled Boards - Pre-release",
13+
"name": "[DEPRECATED - Please install standalone packages] Arduino Mbed OS Boards",
1414
"architecture": "mbed",
1515
"version": "%%VERSION%%",
16-
"category": "Contributed",
16+
"category": "Arduino",
1717
"url": "http://downloads.arduino.cc/cores/staging/%%FILENAME%%",
1818
"archiveFileName": "%%FILENAME%%",
1919
"checksum": "SHA-256:%%CHECKSUM%%",
@@ -22,18 +22,123 @@
2222
"online": "https://github.com/arduino/ArduinoCore-mbed/issues"
2323
},
2424
"boards": [
25+
{
26+
"name": "Arduino Nano 33 BLE"
27+
},
28+
{
29+
"name": "Arduino Nano 33 BLE Sense"
30+
},
2531
{
2632
"name": "Arduino Portenta H7"
2733
},
34+
{
35+
"name": "Arduino Edge Control"
36+
},
37+
{
38+
"name": "Raspberry Pi Pico"
39+
}
40+
],
41+
"toolsDependencies": [
42+
{
43+
"packager": "arduino",
44+
"name": "openocd",
45+
"version": "0.11.0-arduino1"
46+
},
47+
{
48+
"packager": "arduino",
49+
"name": "arm-none-eabi-gcc",
50+
"version": "7-2017q4"
51+
},
52+
{
53+
"packager": "arduino",
54+
"name": "bossac",
55+
"version": "1.9.1-arduino2"
56+
},
57+
{
58+
"packager": "arduino",
59+
"version": "0.10.0-arduino1",
60+
"name": "dfu-util"
61+
},
62+
{
63+
"packager": "arduino",
64+
"version": "1.0.2",
65+
"name": "rp2040tools"
66+
}
67+
]
68+
},
69+
{
70+
"name": "Arduino Mbed OS Edge Boards",
71+
"architecture": "mbed_edge",
72+
"version": "%%VERSION%%",
73+
"category": "Arduino",
74+
"url": "http://downloads.arduino.cc/cores/staging/%%EDGE_FILENAME%%",
75+
"archiveFileName": "%%EDGE_FILENAME%%",
76+
"checksum": "SHA-256:%%EDGE_CHECKSUM%%",
77+
"size": "%%EDGE_SIZE%%",
78+
"help": {
79+
"online": "https://github.com/arduino/ArduinoCore-mbed/issues"
80+
},
81+
"boards": [
82+
{
83+
"name": "Arduino Edge Control"
84+
}
85+
],
86+
"toolsDependencies": [
87+
{
88+
"packager": "arduino",
89+
"name": "openocd",
90+
"version": "0.11.0-arduino1"
91+
},
92+
{
93+
"packager": "arduino",
94+
"name": "arm-none-eabi-gcc",
95+
"version": "7-2017q4"
96+
},
97+
{
98+
"packager": "arduino",
99+
"name": "bossac",
100+
"version": "1.9.1-arduino2"
101+
},
102+
{
103+
"packager": "arduino",
104+
"version": "0.10.0-arduino1",
105+
"name": "dfu-util"
106+
},
107+
{
108+
"packager": "arduino",
109+
"version": "1.0.2",
110+
"name": "rp2040tools"
111+
}
112+
]
113+
},
114+
{
115+
"name": "Arduino Mbed OS Nano Boards",
116+
"architecture": "mbed_nano",
117+
"version": "%%VERSION%%",
118+
"category": "Arduino",
119+
"url": "http://downloads.arduino.cc/cores/staging/%%NANO_FILENAME%%",
120+
"archiveFileName": "%%NANO_FILENAME%%",
121+
"checksum": "SHA-256:%%NANO_CHECKSUM%%",
122+
"size": "%%NANO_SIZE%%",
123+
"help": {
124+
"online": "https://github.com/arduino/ArduinoCore-mbed/issues"
125+
},
126+
"boards": [
28127
{
29128
"name": "Arduino Nano 33 BLE"
129+
},
130+
{
131+
"name": "Arduino Nano 33 BLE Sense"
132+
},
133+
{
134+
"name": "Arduino Nano RP2040 Connect"
30135
}
31136
],
32137
"toolsDependencies": [
33138
{
34139
"packager": "arduino",
35140
"name": "openocd",
36-
"version": "0.10.0-arduino13"
141+
"version": "0.11.0-arduino1"
37142
},
38143
{
39144
"packager": "arduino",
@@ -47,14 +152,98 @@
47152
},
48153
{
49154
"packager": "arduino",
50-
"version": "0.9.0-arduino2",
155+
"version": "0.10.0-arduino1",
51156
"name": "dfu-util"
157+
},
158+
{
159+
"packager": "arduino",
160+
"version": "1.0.2",
161+
"name": "rp2040tools"
162+
}
163+
]
164+
},
165+
{
166+
"name": "Arduino Mbed OS Portenta Boards",
167+
"architecture": "mbed_portenta",
168+
"version": "%%VERSION%%",
169+
"category": "Arduino",
170+
"url": "http://downloads.arduino.cc/cores/staging/%%PORTENTA_FILENAME%%",
171+
"archiveFileName": "%%PORTENTA_FILENAME%%",
172+
"checksum": "SHA-256:%%PORTENTA_CHECKSUM%%",
173+
"size": "%%PORTENTA_SIZE%%",
174+
"help": {
175+
"online": "https://github.com/arduino/ArduinoCore-mbed/issues"
176+
},
177+
"boards": [
178+
{
179+
"name": "Arduino Portenta H7"
180+
}
181+
],
182+
"toolsDependencies": [
183+
{
184+
"packager": "arduino",
185+
"name": "openocd",
186+
"version": "0.11.0-arduino1"
187+
},
188+
{
189+
"packager": "arduino",
190+
"name": "arm-none-eabi-gcc",
191+
"version": "7-2017q4"
192+
},
193+
{
194+
"packager": "arduino",
195+
"version": "0.10.0-arduino1",
196+
"name": "dfu-util"
197+
}
198+
]
199+
},
200+
{
201+
"name": "Arduino Mbed OS RP2040 Boards",
202+
"architecture": "mbed_rp2040",
203+
"version": "%%VERSION%%",
204+
"category": "Arduino",
205+
"url": "http://downloads.arduino.cc/cores/staging/%%RP2040_FILENAME%%",
206+
"archiveFileName": "%%RP2040_FILENAME%%",
207+
"checksum": "SHA-256:%%RP2040_CHECKSUM%%",
208+
"size": "%%RP2040_SIZE%%",
209+
"help": {
210+
"online": "https://github.com/arduino/ArduinoCore-mbed/issues"
211+
},
212+
"boards": [
213+
{
214+
"name": "Raspberry Pi Pico"
215+
}
216+
],
217+
"toolsDependencies": [
218+
{
219+
"packager": "arduino",
220+
"name": "openocd",
221+
"version": "0.11.0-arduino1"
222+
},
223+
{
224+
"packager": "arduino",
225+
"name": "arm-none-eabi-gcc",
226+
"version": "7-2017q4"
227+
},
228+
{
229+
"packager": "arduino",
230+
"name": "bossac",
231+
"version": "1.9.1-arduino2"
232+
},
233+
{
234+
"packager": "arduino",
235+
"version": "0.10.0-arduino1",
236+
"name": "dfu-util"
237+
},
238+
{
239+
"packager": "arduino",
240+
"version": "1.0.2",
241+
"name": "rp2040tools"
52242
}
53243
]
54244
}
55245
],
56-
"tools": [
57-
]
246+
"tools": []
58247
}
59248
]
60-
}
249+
}

‎package.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,18 @@ rm -rf bootloaders
6363
mv _bootloaders bootloaders
6464

6565
#Patch title in platform.txt
66-
sed -i "s/Arduino Mbed OS Boards/Arduino Mbed OS $FLAVOUR Boards/g" platform.txt
66+
sed -i "s/Arduino Mbed OS Boards/Arduino Mbed OS ${FLAVOUR^} Boards/g" platform.txt
6767
sed -i 's/9.9.9/$VERSION/g' platform.txt
6868

69+
BASE_FOLDER=`basename $PWD`
70+
6971
#Package! (remove .git, patches folders)
7072
cd ..
71-
tar --exclude='*.git*' --exclude='*patches*' -cjhf ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 ArduinoCore-mbed
73+
tar --exclude='*.git*' --exclude='*patches*' -cjhf ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 $BASE_FOLDER
74+
if [ x$FLAVOUR == x ]; then
75+
mv ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 ArduinoCore-mbed-$VERSION.tar.bz2
76+
echo FILENAME=ArduinoCore-mbed-$VERSION.tar.bz2 > /tmp/env
77+
else
78+
echo FILENAME=ArduinoCore-mbed-$FLAVOUR-$VERSION.tar.bz2 > /tmp/env
79+
fi
7280
cd -

‎package_full.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ export VERSION="1.5.2"
33

44
FLAVOURS=`ls *.variables`
55

6+
cp extras/package_index.json.NewTag.template /tmp/json
7+
68
for flavour in $FLAVOURS; do
79

810
# Hack, clean everything from known positions and restart
@@ -15,4 +17,32 @@ git clone git@github.com:arduino/ArduinoCore-API.git ../api/
1517
ln -s ../../../api/api cores/arduino/api
1618
./package.sh $flavour
1719

20+
echo "Creating json"
21+
22+
source /tmp/env
23+
CHKSUM=`sha256sum ../$FILENAME | awk '{ print $1 }'`
24+
SIZE=`wc -c ../$FILENAME | awk '{ print $1 }'`
25+
source ${flavour}
26+
27+
FLAVOUR=${FLAVOUR^^}
28+
29+
if [ x$FLAVOUR != x ]; then
30+
FLAVOUR=${FLAVOUR}_
31+
fi
32+
33+
echo FILENAME=$FILENAME
34+
echo CHKSUM=$CHKSUM
35+
echo SIZE=$SIZE
36+
echo VERSION=$VERSION
37+
echo FLAVOUR=$FLAVOUR
38+
39+
cat /tmp/json |
40+
sed "s/%%VERSION%%/${VERSION}/" |
41+
sed "s/%%${FLAVOUR}FILENAME%%/${FILENAME}/" |
42+
sed "s/%%${FLAVOUR}CHECKSUM%%/${CHKSUM}/" |
43+
sed "s/%%${FLAVOUR}SIZE%%/${SIZE}/" > /tmp/json2
44+
mv /tmp/json2 /tmp/json
45+
1846
done
47+
48+
cp /tmp/json package_${CORE_NAME}_${VERSION}_index.json

‎rp2040.variables‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export FLAVOUR="rp2040"
1+
export FLAVOUR="RP2040"
22
export VARIANTS=("RASPBERRY_PI_PICO")
33
export FQBNS=("pico")
44
export LIBRARIES=("PDM SPI Wire MRI USBHID USBMSD ThreadDebug Scheduler")

0 commit comments

Comments
 (0)