Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6e79acd

Browse files
authored
Merge pull request #1072 from pennam/align-templates
Align json templates for core release
2 parents 6b1e1f7 + 974f120 commit 6e79acd

9 files changed

+71
-70
lines changed

‎extras/mbed_edge-tag.template.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
}
2121
],
2222
"toolsDependencies": [
23-
{
24-
"packager": "arduino",
25-
"name": "openocd",
26-
"version": "0.11.0-arduino2"
27-
},
2823
{
2924
"packager": "arduino",
3025
"name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
3732
},
3833
{
3934
"packager": "arduino",
40-
"version": "0.10.0-arduino1",
41-
"name": "dfu-util"
35+
"name": "dfu-util",
36+
"version": "0.10.0-arduino1"
37+
},
38+
{
39+
"packager": "arduino",
40+
"name": "openocd",
41+
"version": "0.11.0-arduino2"
4242
},
4343
{
4444
"packager": "arduino",
45-
"version": "1.0.6",
46-
"name": "rp2040tools"
45+
"name": "rp2040tools",
46+
"version": "1.0.6"
4747
}
4848
]
4949
}

‎extras/mbed_giga-tag.template.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
"toolsDependencies": [
2323
{
2424
"packager": "arduino",
25-
"name": "openocd",
26-
"version": "0.11.0-arduino2"
25+
"name": "arm-none-eabi-gcc",
26+
"version": "7-2017q4"
2727
},
2828
{
2929
"packager": "arduino",
30-
"name": "arm-none-eabi-gcc",
31-
"version": "7-2017q4"
30+
"name": "dfu-util",
31+
"version": "0.10.0-arduino1"
3232
},
3333
{
3434
"packager": "arduino",
35-
"version": "0.10.0-arduino1",
36-
"name": "dfu-util"
35+
"name": "imgtool",
36+
"version": "1.8.0-arduino.2"
3737
},
3838
{
3939
"packager": "arduino",
40-
"version": "1.8.0-arduino.2",
41-
"name": "imgtool"
40+
"name": "openocd",
41+
"version": "0.11.0-arduino2"
4242
}
4343
]
4444
}

‎extras/mbed_nano-tag.template.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
}
2727
],
2828
"toolsDependencies": [
29-
{
30-
"packager": "arduino",
31-
"name": "openocd",
32-
"version": "0.11.0-arduino2"
33-
},
3429
{
3530
"packager": "arduino",
3631
"name": "arm-none-eabi-gcc",
@@ -43,13 +38,18 @@
4338
},
4439
{
4540
"packager": "arduino",
46-
"version": "0.10.0-arduino1",
47-
"name": "dfu-util"
41+
"name": "dfu-util",
42+
"version": "0.10.0-arduino1"
43+
},
44+
{
45+
"packager": "arduino",
46+
"name": "openocd",
47+
"version": "0.11.0-arduino2"
4848
},
4949
{
5050
"packager": "arduino",
51-
"version": "1.0.6",
52-
"name": "rp2040tools"
51+
"name": "rp2040tools",
52+
"version": "1.0.6"
5353
}
5454
]
5555
}

‎extras/mbed_nicla-tag.template.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
}
2727
],
2828
"toolsDependencies": [
29-
{
30-
"packager": "arduino",
31-
"name": "openocd",
32-
"version": "0.11.0-arduino2"
33-
},
3429
{
3530
"packager": "arduino",
3631
"name": "arm-none-eabi-gcc",
@@ -43,13 +38,18 @@
4338
},
4439
{
4540
"packager": "arduino",
46-
"version": "0.10.0-arduino1",
47-
"name": "dfu-util"
41+
"name": "dfu-util",
42+
"version": "0.10.0-arduino1"
43+
},
44+
{
45+
"packager": "arduino",
46+
"name": "openocd",
47+
"version": "0.11.0-arduino2"
4848
},
4949
{
5050
"packager": "arduino",
51-
"version": "1.0.6",
52-
"name": "rp2040tools"
51+
"name": "rp2040tools",
52+
"version": "1.0.6"
5353
}
5454
]
5555
}

‎extras/mbed_opta-tag.template.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
"toolsDependencies": [
2323
{
2424
"packager": "arduino",
25-
"name": "openocd",
26-
"version": "0.11.0-arduino2"
25+
"name": "arm-none-eabi-gcc",
26+
"version": "7-2017q4"
2727
},
2828
{
2929
"packager": "arduino",
30-
"name": "arm-none-eabi-gcc",
31-
"version": "7-2017q4"
30+
"name": "dfu-util",
31+
"version": "0.10.0-arduino1"
3232
},
3333
{
3434
"packager": "arduino",
35-
"version": "0.10.0-arduino1",
36-
"name": "dfu-util"
35+
"name": "imgtool",
36+
"version": "1.8.0-arduino.2"
3737
},
3838
{
3939
"packager": "arduino",
40-
"version": "1.8.0-arduino.2",
41-
"name": "imgtool"
40+
"name": "openocd",
41+
"version": "0.11.0-arduino2"
4242
}
4343
]
4444
}

‎extras/mbed_portenta-tag.template.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"toolsDependencies": [
2626
{
2727
"packager": "arduino",
28-
"name": "openocd",
29-
"version": "0.11.0-arduino2"
28+
"name": "adb",
29+
"version": "32.0.0"
3030
},
3131
{
3232
"packager": "arduino",
@@ -35,18 +35,18 @@
3535
},
3636
{
3737
"packager": "arduino",
38-
"version": "0.10.0-arduino1",
39-
"name": "dfu-util"
38+
"name": "dfu-util",
39+
"version": "0.10.0-arduino1"
4040
},
4141
{
4242
"packager": "arduino",
43-
"version": "1.8.0-arduino.2",
44-
"name": "imgtool"
43+
"name": "imgtool",
44+
"version": "1.8.0-arduino.2"
4545
},
4646
{
4747
"packager": "arduino",
48-
"version": "32.0.0",
49-
"name": "adb"
48+
"name": "openocd",
49+
"version": "0.11.0-arduino2"
5050
}
5151
]
5252
}

‎extras/mbed_rp2040-tag.template.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
}
2121
],
2222
"toolsDependencies": [
23-
{
24-
"packager": "arduino",
25-
"name": "openocd",
26-
"version": "0.11.0-arduino2"
27-
},
2823
{
2924
"packager": "arduino",
3025
"name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
3732
},
3833
{
3934
"packager": "arduino",
40-
"version": "0.10.0-arduino1",
41-
"name": "dfu-util"
35+
"name": "dfu-util",
36+
"version": "0.10.0-arduino1"
37+
},
38+
{
39+
"packager": "arduino",
40+
"name": "openocd",
41+
"version": "0.11.0-arduino2"
4242
},
4343
{
4444
"packager": "arduino",
45-
"version": "1.0.6",
46-
"name": "rp2040tools"
45+
"name": "rp2040tools",
46+
"version": "1.0.6"
4747
}
4848
]
4949
}

‎extras/mbed_stella-tag.template.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
}
2121
],
2222
"toolsDependencies": [
23-
{
24-
"packager": "arduino",
25-
"name": "openocd",
26-
"version": "0.11.0-arduino2"
27-
},
2823
{
2924
"packager": "arduino",
3025
"name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
3732
},
3833
{
3934
"packager": "arduino",
40-
"version": "0.10.0-arduino1",
41-
"name": "dfu-util"
35+
"name": "dfu-util",
36+
"version": "0.10.0-arduino1"
37+
},
38+
{
39+
"packager": "arduino",
40+
"name": "openocd",
41+
"version": "0.11.0-arduino2"
4242
},
4343
{
4444
"packager": "arduino",
45-
"version": "1.0.6",
46-
"name": "rp2040tools"
45+
"name": "rp2040tools",
46+
"version": "1.0.6"
4747
}
4848
]
4949
}

‎package.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,12 @@ CHKSUM=`sha256sum $FILENAME | awk '{ print 1ドル }'`
8080
SIZE=`wc -c $FILENAME | awk '{ print 1ドル }'`
8181
FLAVOUR_TAG=${FLAVOUR^^}_
8282
FLAVOUR_NAME=${FLAVOUR,,}
83+
VERSION_NAME=${VERSION//./-}
8384

8485
cat ArduinoCore-mbed/extras/mbed_$FLAVOUR_NAME-tag.template.json |
8586
sed "s/%%VERSION%%/${VERSION}/" |
8687
sed "s/%%${FLAVOUR_TAG}FILENAME%%/${FILENAME}/" |
8788
sed "s/%%${FLAVOUR_TAG}CHECKSUM%%/${CHKSUM}/" |
88-
sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION.json
89+
sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION_NAME.json
8990

9091
cd -

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /