revert to the original way template gets our boards list

package/build_boards_manager_package.sh

@@ -146,11 +146,7 @@ if [ ! -z "${DOC_URL}" ]; then
  .packages[0].platforms[0].help.online = \"${DOC_URL}\""
 fi
 
-jq_arg="${jq_arg} |\
- .packages[0].platforms[0].boards = "'$'"boards"
-
-jq --slurpfile boards ${srcdir}/package/package_esp8266com_index.boards.json \
- "${jq_arg}" ${srcdir}/package/package_esp8266com_index.template.json \
+jq "${jq_arg}" ${srcdir}/package/package_esp8266com_index.template.json \
  > package_esp8266com_index.json
 
 # Use Github API token, if available

package/package_esp8266com_index.template.json

@@ -16,7 +16,119 @@
  "version": "",
  "architecture": "esp8266",
  "archiveFileName": "",
- "boards": [],
+ "boards": [
+ {
+ "name": "Generic ESP8266 Module"
+ },
+ {
+ "name": "Generic ESP8285 Module"
+ },
+ {
+ "name": "4D Systems gen4 IoD Range"
+ },
+ {
+ "name": "Adafruit Feather HUZZAH ESP8266"
+ },
+ {
+ "name": "Amperka WiFi Slot"
+ },
+ {
+ "name": "Arduino"
+ },
+ {
+ "name": "DOIT ESP-Mx DevKit (ESP8285)"
+ },
+ {
+ "name": "Digistump Oak"
+ },
+ {
+ "name": "ESPDuino (ESP-13 Module)"
+ },
+ {
+ "name": "ESPectro Core"
+ },
+ {
+ "name": "ESPino (ESP-12 Module)"
+ },
+ {
+ "name": "ESPresso Lite 1.0"
+ },
+ {
+ "name": "ESPresso Lite 2.0"
+ },
+ {
+ "name": "ITEAD Sonoff"
+ },
+ {
+ "name": "Invent One"
+ },
+ {
+ "name": "LOLIN(WEMOS) D1 R2 & mini"
+ },
+ {
+ "name": "LOLIN(WEMOS) D1 mini (clone)"
+ },
+ {
+ "name": "LOLIN(WEMOS) D1 mini Lite"
+ },
+ {
+ "name": "LOLIN(WEMOS) D1 mini Pro"
+ },
+ {
+ "name": "LOLIN(WeMos) D1 R1"
+ },
+ {
+ "name": "Lifely Agrumino Lemon v4"
+ },
+ {
+ "name": "NodeMCU 0.9 (ESP-12 Module)"
+ },
+ {
+ "name": "NodeMCU 1.0 (ESP-12E Module)"
+ },
+ {
+ "name": "Olimex MOD-WIFI-ESP8266(-DEV)"
+ },
+ {
+ "name": "Phoenix 1.0"
+ },
+ {
+ "name": "Phoenix 2.0"
+ },
+ {
+ "name": "Schirmilabs Eduino WiFi"
+ },
+ {
+ "name": "Seeed Wio Link"
+ },
+ {
+ "name": "SparkFun Blynk Board"
+ },
+ {
+ "name": "SparkFun ESP8266 Thing"
+ },
+ {
+ "name": "SparkFun ESP8266 Thing Dev"
+ },
+ {
+ "name": "SweetPea ESP-210"
+ },
+ {
+ "name": "ThaiEasyElec's ESPino"
+ },
+ {
+ "name": "WiFi Kit 8"
+ },
+ {
+ "name": "WiFiduino"
+ },
+ {
+ "name": "WifInfo"
+ },
+ {
+ "name": "XinaBox CW01"
+ }
+ ],
  "toolsDependencies": [
  {
  "packager": "esp8266",
@@ -268,4 +380,4 @@
  ]
  }
  ]
-}
+}

tools/boards.txt.py

@@ -1279,13 +1279,11 @@
  ],
  "desc": [
  "ESP8266 based devices from ITEAD: Sonoff SV, Sonoff TH, Sonoff"
- " Basic, "
- + "and Sonoff S20",
+ " Basic, and Sonoff S20",
  "",
  "These are not development boards. The development process is "
- + "inconvenient with these devices. When flashing firmware you"
- " will "
- + "need a Serial Adapter to connect it to your computer.",
+ "inconvenient with these devices. When flashing firmware you"
+ " will need a Serial Adapter to connect it to your computer.",
  "",
  " | Most of these devices, during normal operation, are"
  " connected to "
@@ -2241,10 +2239,7 @@ def ldscript_name(*, flash_size, expected_fs_size, **kwargs):
  >>> ldscript_name(flash_size=Kilobytes(512), expected_fs_size=Bytes(0))
  'eagle.flash.512k.ld'
  """
- return (
- f"eagle.flash.{humanize_flash(flash_size)}{humanize_fs(expected_fs_size)}.ld"
- .lower()
- )
+ return f"eagle.flash.{humanize_flash(flash_size)}{humanize_fs(expected_fs_size)}.ld".lower()
 
 
 SPI_START = 0x40200000
@@ -2466,7 +2461,7 @@ def size(value):
  print(" dport0_0_seg : org = 0x3FF00000, len = 0x10")
  print(" dram0_0_seg : org = 0x3FFE8000, len = 0x14000")
  print(
-  f" irom0_0_seg : org = {address(sketch)}, len = 0x{sketch.size:x}"
+ f" irom0_0_seg : org = {address(sketch)}, len = 0x{sketch.size:x}"
  )
  print("}")
  print()
@@ -2877,20 +2872,23 @@ def show_names(boards):
 ################################################################
 # boards .json
 
-def package_generate(output, boards):
+
+def package_generate(output, package_file, boards):
+ with open(package_file, "r", encoding="utf-8") as f:
+ contents = json.load(f)
+
+ contents["packages"][0]["platforms"][0]["boards"] = [
+ {"name": board["name"]} for board in boards.values()
+ ]
+
  with output:
- print(
- json.dumps(
- [{"name": board["name"]} for board in boards.values()],
- indent=3,
- separators=(",", ": "),
- )
- )
+ json.dump(contents, sys.stdout, indent=3, separators=(",", ": "))
 
 
 ################################################################
 # boards .rst, here's the only place to use "desc" field
 
+
 def doc_generate(output, boards):
  with output:
  print("Boards")
@@ -2916,8 +2914,8 @@ def doc_generate(output, boards):
  (
  "package",
  "package-file",
- "package/package_esp8266com_index.boards.json",
- "IDE package index boards list (.json)",
+ "package/package_esp8266com_index.template.json",
+ "IDE package index template (.json)",
  ),
  ("doc", "doc-file", "doc/boards.rst", "Boards documentation (.rst)"),
 )
@@ -3034,7 +3032,7 @@ def maybe_output(file):
  flashmap_generate(maybe_output(args.flashmap_file), all_flash_maps())
 
  if "package" in generators:
- package_generate(maybe_output(args.package_file), boards)
+ package_generate(maybe_output(args.package_file), args.package_file, boards)
 
  if "doc" in generators:
  doc_generate(maybe_output(args.doc_file), boards)
@@ -3043,6 +3041,7 @@ def maybe_output(file):
 ################################################################
 # entrypoint
 
+
 def main():
  args = parse_cmdline()