From 566e57cc2336eadaa3a4e5dae9a4dd00dc024f49 Mon Sep 17 00:00:00 2001
From: puddly <32534428+puddly@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:26:27 -0400
Subject: [PATCH] Run it on the repo
---
misc/firmware-eraser/.cproject | 1925 +++++++++++++-
src/bootloader-uart-xmodem/.cproject | 1293 +++++++++-
src/ncp-uart-hw/.cproject | 2142 +++++++++++++++-
src/ot-rcp/.cproject | 2116 ++++++++++++++-
src/rcp-uart-802154/.cproject | 2258 ++++++++++++++++-
src/zwave_ncp_serial_api_controller/.cproject | 1768 ++++++++++++-
tools/normalize_cproject.py | 16 +-
7 files changed, 11500 insertions(+), 18 deletions(-)
diff --git a/misc/firmware-eraser/.cproject b/misc/firmware-eraser/.cproject
index b18de704..b57143a3 100644
--- a/misc/firmware-eraser/.cproject
+++ b/misc/firmware-eraser/.cproject
@@ -23,7 +23,1099 @@
-
+
@@ -264,7 +1356,665 @@
-
+
@@ -330,7 +2080,176 @@
-
+
diff --git a/src/bootloader-uart-xmodem/.cproject b/src/bootloader-uart-xmodem/.cproject
index 5c14b55e..5147e181 100644
--- a/src/bootloader-uart-xmodem/.cproject
+++ b/src/bootloader-uart-xmodem/.cproject
@@ -23,7 +23,1141 @@
-
+
@@ -245,7 +1379,162 @@
-
+
diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject
index 0f1c0557..6c986ce3 100644
--- a/src/ncp-uart-hw/.cproject
+++ b/src/ncp-uart-hw/.cproject
@@ -23,7 +23,1640 @@
-
+
@@ -515,7 +2148,512 @@
-
+
diff --git a/src/ot-rcp/.cproject b/src/ot-rcp/.cproject
index bed3f49b..81d067c9 100644
--- a/src/ot-rcp/.cproject
+++ b/src/ot-rcp/.cproject
@@ -23,7 +23,1782 @@
-
+
@@ -445,7 +2220,344 @@
-
+
diff --git a/src/rcp-uart-802154/.cproject b/src/rcp-uart-802154/.cproject
index 75846ce3..c6a56418 100644
--- a/src/rcp-uart-802154/.cproject
+++ b/src/rcp-uart-802154/.cproject
@@ -23,7 +23,1861 @@
-
+
@@ -499,7 +2353,407 @@
-
+
diff --git a/src/zwave_ncp_serial_api_controller/.cproject b/src/zwave_ncp_serial_api_controller/.cproject
index 09078e5b..7e0221d8 100644
--- a/src/zwave_ncp_serial_api_controller/.cproject
+++ b/src/zwave_ncp_serial_api_controller/.cproject
@@ -23,7 +23,1266 @@
-
+
@@ -367,7 +1626,512 @@
-
+
diff --git a/tools/normalize_cproject.py b/tools/normalize_cproject.py
index 7d05b355..c6fc2116 100644
--- a/tools/normalize_cproject.py
+++ b/tools/normalize_cproject.py
@@ -5,6 +5,11 @@
import xml.etree.ElementTree as ET
+def json_dumps(obj: dict | list) -> str:
+ """Compactly dump JSON into a string."""
+ return json.dumps(obj, separators=(", ", ": "), indent=4)
+
+
cproject_path = pathlib.Path(sys.argv[1])
cproject = cproject_path.read_text()
@@ -20,7 +25,7 @@
copied_files.sort(
key=lambda f: (f["generated"], f["projectPath"], f["version"])
)
- storage_module.attrib["projectCommon.copiedFiles"] = json.dumps(copied_files)
+ storage_module.attrib["projectCommon.copiedFiles"] = json_dumps(copied_files)
if "cppBuildConfig.projectBuiltInState" in storage_module.attrib:
project_built_in_state = json.loads(
@@ -32,9 +37,9 @@
resolved_options = json.loads(state["resolvedOptionsStr"])
resolved_options.sort(key=lambda o: o["optionId"])
- state["resolvedOptionsStr"] = json.dumps(resolved_options)
+ state["resolvedOptionsStr"] = json_dumps(resolved_options)
- storage_module.attrib["cppBuildConfig.projectBuiltInState"] = json.dumps(
+ storage_module.attrib["cppBuildConfig.projectBuiltInState"] = json_dumps(
project_built_in_state
)
@@ -42,7 +47,7 @@
referenced_modules = json.loads(
storage_module.attrib["projectCommon.referencedModules"]
)
- storage_module.attrib["projectCommon.referencedModules"] = json.dumps(
+ storage_module.attrib["projectCommon.referencedModules"] = json_dumps(
referenced_modules
)
@@ -52,7 +57,8 @@
# Replace newlines with literals!
xml_text = xml_text.replace("
", "\n")
-xml_text = xml_text.replace("\\n", "\n\\n")
+# xml_text.replace("\\n", "\n\\n")
+xml_text = re.sub(r"\s+\\n\s+", "\n\\n", xml_text, flags=re.MULTILINE)
# Only touch the filesystem if we need to
if processing_instructions + xml_text != cproject: