Keep OTA headers aligned with the checked-out vendored source

arch/esp32/AsyncElegantOTA/src/AsyncElegantOTA.cpp

@@ -1,4 +1,4 @@
-#include <AsyncElegantOTA.h>
+#include "AsyncElegantOTA.h"
 #include <atomic>
 static std::atomic<bool> ota_uploads_enabled{false};
 static std::atomic<bool> ota_upload_busy{false};

examples/esp32_partition_legacy_seed/main.cpp

@@ -11,7 +11,7 @@
 #include <WiFi.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
-#include <AsyncElegantOTA.h>
+#include "../../arch/esp32/AsyncElegantOTA/src/AsyncElegantOTA.h"
 #include <SPIFFS.h>
 
 #include <helpers/esp32/WiFiRadioPolicy.h>

examples/esp32_partition_migrator/main.cpp

@@ -2,7 +2,7 @@
 #include <WiFi.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
-#include <AsyncElegantOTA.h>
+#include "../../arch/esp32/AsyncElegantOTA/src/AsyncElegantOTA.h"
 #include <Preferences.h>
 #include <SPIFFS.h>
 #include <esp_ota_ops.h>

scripts/esp32_async_web_fix.py

@@ -35,6 +35,14 @@ def replace_async_source(build_env, node):
         return node
     destination = Path(build_env.subst("$BUILD_DIR")) / "patched-esp32-web" / source.name
     destination.parent.mkdir(parents=True, exist_ok=True)
+    if source.name == "AsyncElegantOTA.cpp":
+        # Quoted includes resolve beside this private source, ahead of any
+        # stale library include path inherited by PlatformIO's build clone.
+        for name in ("AsyncElegantOTA.h", "Hash.h", "elegantWebpage.h"):
+            header = (include_dir / name).read_bytes()
+            target = destination.parent / name
+            if not target.exists() or target.read_bytes() != header:
+                target.write_bytes(header)
     if not destination.exists() or destination.read_text(encoding="ascii") != content:
         destination.write_text(content, encoding="ascii")
     build_env.PrependUnique(CPPPATH=[str(include_dir)])
@@ -42,8 +50,6 @@ def replace_async_source(build_env, node):
 
 
 def install(build_env):
-    build_env.PrependUnique(CPPPATH=[str(Path(build_env.subst("$PROJECT_DIR"))
-        / "arch/esp32/AsyncElegantOTA/src")])
     build_env.AddBuildMiddleware(replace_async_source, "*AsyncTCP*src*AsyncTCP.cpp")
     build_env.AddBuildMiddleware(replace_async_source, "*AsyncElegantOTA*src*AsyncElegantOTA.cpp")
 

src/helpers/ESP32Board.cpp

@@ -365,7 +365,7 @@ bool ESP32Board::stopOTAUpdate(char reply[]) {
 #include <helpers/esp32/WiFiRadioPolicy.h>
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>
-#include <AsyncElegantOTA.h>
+#include "../../arch/esp32/AsyncElegantOTA/src/AsyncElegantOTA.h"
 #include <new>
 
 #include <SPIFFS.h>