Merge pull request #1072 from pennam/align-templates

pennam · web-flow · commit 6e79acdf8054 · 2025-06-26T13:03:41.000+02:00
Align json templates for core release
diff --git a/extras/mbed_edge-tag.template.json b/extras/mbed_edge-tag.template.json
@@ -20,11 +20,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_giga-tag.template.json b/extras/mbed_giga-tag.template.json
@@ -22,23 +22,23 @@
           "toolsDependencies": [
             {
               "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
             },
             {
               "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "imgtool",
+              "version": "1.8.0-arduino.2"
             },
             {
               "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             }
           ]
         }
diff --git a/extras/mbed_nano-tag.template.json b/extras/mbed_nano-tag.template.json
@@ -26,11 +26,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -43,13 +38,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_nicla-tag.template.json b/extras/mbed_nicla-tag.template.json
@@ -26,11 +26,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -43,13 +38,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_opta-tag.template.json b/extras/mbed_opta-tag.template.json
@@ -22,23 +22,23 @@
           "toolsDependencies": [
             {
               "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
+              "name": "arm-none-eabi-gcc",
+              "version": "7-2017q4"
             },
             {
               "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "7-2017q4"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "imgtool",
+              "version": "1.8.0-arduino.2"
             },
             {
               "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             }
           ]
         }
diff --git a/extras/mbed_portenta-tag.template.json b/extras/mbed_portenta-tag.template.json
@@ -25,8 +25,8 @@
           "toolsDependencies": [
             {
               "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
+              "name": "adb",
+              "version": "32.0.0"
             },
             {
               "packager": "arduino",
@@ -35,18 +35,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
             },
             {
               "packager": "arduino",
-              "version": "1.8.0-arduino.2",
-              "name": "imgtool"
+              "name": "imgtool",
+              "version": "1.8.0-arduino.2"
             },
             {
               "packager": "arduino",
-              "version": "32.0.0",
-              "name": "adb"
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             }
           ]
         }
diff --git a/extras/mbed_rp2040-tag.template.json b/extras/mbed_rp2040-tag.template.json
@@ -20,11 +20,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/extras/mbed_stella-tag.template.json b/extras/mbed_stella-tag.template.json
@@ -20,11 +20,6 @@
             }
           ],
           "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.11.0-arduino2"
-            },
             {
               "packager": "arduino",
               "name": "arm-none-eabi-gcc",
@@ -37,13 +32,18 @@
             },
             {
               "packager": "arduino",
-              "version": "0.10.0-arduino1",
-              "name": "dfu-util"
+              "name": "dfu-util",
+              "version": "0.10.0-arduino1"
+            },
+            {
+              "packager": "arduino",
+              "name": "openocd",
+              "version": "0.11.0-arduino2"
             },
             {
               "packager": "arduino",
-              "version": "1.0.6",
-              "name": "rp2040tools"
+              "name": "rp2040tools",
+              "version": "1.0.6"
             }
           ]
         }
diff --git a/package.sh b/package.sh
@@ -80,11 +80,12 @@ CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'`
 SIZE=`wc -c $FILENAME | awk '{ print $1 }'`
 FLAVOUR_TAG=${FLAVOUR^^}_
 FLAVOUR_NAME=${FLAVOUR,,}
+VERSION_NAME=${VERSION//./-}
 
 cat ArduinoCore-mbed/extras/mbed_$FLAVOUR_NAME-tag.template.json |
 sed "s/%%VERSION%%/${VERSION}/" |
 sed "s/%%${FLAVOUR_TAG}FILENAME%%/${FILENAME}/" |
 sed "s/%%${FLAVOUR_TAG}CHECKSUM%%/${CHKSUM}/" |
-sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION.json
+sed "s/%%${FLAVOUR_TAG}SIZE%%/${SIZE}/" > mbed_$FLAVOUR_NAME-$VERSION_NAME.json
 
 cd -

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,6 @@`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`"toolsDependencies": [`
`23`		`- {`
`24`		`- "packager": "arduino",`
`25`		`- "name": "openocd",`
`26`		`- "version": "0.11.0-arduino2"`
`27`		`- },`
`28`	`23`	`{`
`29`	`24`	`"packager": "arduino",`
`30`	`25`	`"name": "arm-none-eabi-gcc",`
`@@ -37,13 +32,18 @@`
`37`	`32`	`},`
`38`	`33`	`{`
`39`	`34`	`"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"`
`42`	`42`	`},`
`43`	`43`	`{`
`44`	`44`	`"packager": "arduino",`
`45`		`- "version": "1.0.6",`
`46`		`- "name": "rp2040tools"`
	`45`	`+ "name": "rp2040tools",`
	`46`	`+ "version": "1.0.6"`
`47`	`47`	`}`
`48`	`48`	`]`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,23 +22,23 @@`
`22`	`22`	`"toolsDependencies": [`
`23`	`23`	`{`
`24`	`24`	`"packager": "arduino",`
`25`		`- "name": "openocd",`
`26`		`- "version": "0.11.0-arduino2"`
	`25`	`+ "name": "arm-none-eabi-gcc",`
	`26`	`+ "version": "7-2017q4"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"packager": "arduino",`
`30`		`- "name": "arm-none-eabi-gcc",`
`31`		`- "version": "7-2017q4"`
	`30`	`+ "name": "dfu-util",`
	`31`	`+ "version": "0.10.0-arduino1"`
`32`	`32`	`},`
`33`	`33`	`{`
`34`	`34`	`"packager": "arduino",`
`35`		`- "version": "0.10.0-arduino1",`
`36`		`- "name": "dfu-util"`
	`35`	`+ "name": "imgtool",`
	`36`	`+ "version": "1.8.0-arduino.2"`
`37`	`37`	`},`
`38`	`38`	`{`
`39`	`39`	`"packager": "arduino",`
`40`		`- "version": "1.8.0-arduino.2",`
`41`		`- "name": "imgtool"`
	`40`	`+ "name": "openocd",`
	`41`	`+ "version": "0.11.0-arduino2"`
`42`	`42`	`}`
`43`	`43`	`]`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,6 @@`
`26`	`26`	`}`
`27`	`27`	`],`
`28`	`28`	`"toolsDependencies": [`
`29`		`- {`
`30`		`- "packager": "arduino",`
`31`		`- "name": "openocd",`
`32`		`- "version": "0.11.0-arduino2"`
`33`		`- },`
`34`	`29`	`{`
`35`	`30`	`"packager": "arduino",`
`36`	`31`	`"name": "arm-none-eabi-gcc",`
`@@ -43,13 +38,18 @@`
`43`	`38`	`},`
`44`	`39`	`{`
`45`	`40`	`"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"`
`48`	`48`	`},`
`49`	`49`	`{`
`50`	`50`	`"packager": "arduino",`
`51`		`- "version": "1.0.6",`
`52`		`- "name": "rp2040tools"`
	`51`	`+ "name": "rp2040tools",`
	`52`	`+ "version": "1.0.6"`
`53`	`53`	`}`
`54`	`54`	`]`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`"toolsDependencies": [`
`26`	`26`	`{`
`27`	`27`	`"packager": "arduino",`
`28`		`- "name": "openocd",`
`29`		`- "version": "0.11.0-arduino2"`
	`28`	`+ "name": "adb",`
	`29`	`+ "version": "32.0.0"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`	`32`	`"packager": "arduino",`
`@@ -35,18 +35,18 @@`
`35`	`35`	`},`
`36`	`36`	`{`
`37`	`37`	`"packager": "arduino",`
`38`		`- "version": "0.10.0-arduino1",`
`39`		`- "name": "dfu-util"`
	`38`	`+ "name": "dfu-util",`
	`39`	`+ "version": "0.10.0-arduino1"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"packager": "arduino",`
`43`		`- "version": "1.8.0-arduino.2",`
`44`		`- "name": "imgtool"`
	`43`	`+ "name": "imgtool",`
	`44`	`+ "version": "1.8.0-arduino.2"`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"packager": "arduino",`
`48`		`- "version": "32.0.0",`
`49`		`- "name": "adb"`
	`48`	`+ "name": "openocd",`
	`49`	`+ "version": "0.11.0-arduino2"`
`50`	`50`	`}`
`51`	`51`	`]`
`52`	`52`	`}`