From 99737f5783bda40a7c2567fd24ad12e9e36da3e0 Mon Sep 17 00:00:00 2001 From: TD-er Date: Wed, 6 Dec 2023 00:09:36 +0100 Subject: [PATCH] [Build] Put IR libs in lib_ignore for 'normal' builds to speed up builds --- platformio_esp32_envs.ini | 13 ++++++++----- platformio_esp32_solo1.ini | 5 +++-- platformio_esp32c2_envs.ini | 5 +++-- platformio_esp32c3_envs.ini | 9 ++++++--- platformio_esp32c6_envs.ini | 10 ++++++++-- platformio_esp32s2_envs.ini | 8 +++++--- platformio_esp32s3_envs.ini | 6 ++++-- platformio_esp82xx_base.ini | 4 +++- platformio_esp82xx_envs.ini | 9 +++------ platformio_special_envs.ini | 6 ++---- 10 files changed, 45 insertions(+), 30 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index ce80f8969..7639cccd6 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -60,7 +60,7 @@ build_flags = ${core_esp32_IDF5_1__3_0_0.build_flags} -fno-strict-aliasing -flto=auto -Wswitch - -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE + -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_ERROR monitor_filters = esp32_exception_decoder lib_ignore = ${core_esp32_IDF5_1__3_0_0.lib_ignore} @@ -93,8 +93,7 @@ lib_ignore = ESP8266Ping extends = esp32_base lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DESP32_CLASSIC @@ -179,12 +178,14 @@ build_flags = ${esp32_custom_base_LittleFS.build_flags} [env:normal_ESP32_4M316k] extends = esp32_common board = esp32_4M - +lib_ignore = ${esp32_common.lib_ignore} + ${no_ir.lib_ignore} [env:normal_ESP32_4M316k_LittleFS] extends = esp32_common_LittleFS board = esp32_4M - +lib_ignore = ${esp32_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} [env:collection_A_ESP32_4M316k] extends = esp32_common @@ -346,12 +347,14 @@ extends = env:normal_ESP32_4M316k build_flags = ${env:normal_ESP32_4M316k.build_flags} -DFEATURE_ETHERNET=1 + [env:normal_ESP32_4M316k_LittleFS_ETH] extends = esp32_common_LittleFS board = esp32_4M lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ${esp32_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} build_flags = ${esp32_common_LittleFS.build_flags} -DFEATURE_ETHERNET=1 diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini index 6b9e16c7c..5fa454a52 100644 --- a/platformio_esp32_solo1.ini +++ b/platformio_esp32_solo1.ini @@ -7,8 +7,7 @@ extends = esp32_base platform_packages = framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1646/framework-arduinoespressif32-solo1-release_v4.4_spiffs-e3fc63b439.zip lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -40,6 +39,8 @@ extra_scripts = ${esp32_solo1_common_LittleFS.extra_scripts} [env:normal_ESP32solo1_4M316k_LittleFS] extends = esp32_solo1_common_LittleFS board = esp32_solo1_4M +lib_ignore = ${esp32_solo1_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} [env:energy_ESP32solo1_4M316k_LittleFS] diff --git a/platformio_esp32c2_envs.ini b/platformio_esp32c2_envs.ini index fa4f25a96..ce0c85ddf 100644 --- a/platformio_esp32c2_envs.ini +++ b/platformio_esp32c2_envs.ini @@ -5,8 +5,7 @@ extends = esp32_base lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -61,3 +60,5 @@ extra_scripts = ${esp32c2_common_LittleFS.extra_scripts} [env:normal_ESP32c2_4M316k_LittleFS] extends = esp32c2_common_LittleFS board = esp32c2 +lib_ignore = ${esp32c2_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 191529d58..bb8162a03 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -5,8 +5,7 @@ extends = esp32_base lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -53,11 +52,15 @@ extra_scripts = ${esp32c3_common.extra_scripts} [env:normal_ESP32c3_4M316k_CDC] extends = esp32c3_common board = esp32c3cdc +lib_ignore = ${esp32_common.lib_ignore} + ${no_ir.lib_ignore} + [env:normal_ESP32c3_4M316k_LittleFS_CDC] extends = esp32c3_common_LittleFS board = esp32c3cdc - +lib_ignore = ${esp32c3_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} [env:collection_A_ESP32c3_4M316k_CDC] extends = esp32c3_common diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 2d696954f..a81bb78d0 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -5,8 +5,7 @@ extends = esp32_base lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -38,3 +37,10 @@ build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32c6.py + + +[env:normal_ESP32c6_4M316k_LittleFS] +extends = esp32c6_common_LittleFS +board = esp32c6 +lib_ignore = ${esp32c6_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 5bf078eea..44c0d0231 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -6,8 +6,7 @@ extends = esp32_base lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -71,12 +70,15 @@ extra_scripts = ${esp32s2_common.extra_scripts} [env:normal_ESP32s2_4M316k_CDC] extends = esp32s2_common board = esp32s2_cdc +lib_ignore = ${esp32s2_common.lib_ignore} + ${no_ir.lib_ignore} [env:normal_ESP32s2_4M316k_LittleFS_CDC] extends = esp32s2_common_LittleFS board = esp32s2_cdc - +lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} + ${no_ir.lib_ignore} [env:collection_A_ESP32s2_4M316k_CDC] extends = esp32s2_common diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index a28f06195..6ff40a7f2 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -6,8 +6,7 @@ extends = esp32_base lib_ignore = ${esp32_always.lib_ignore} ESP32_ping - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} ESP32 BLE Arduino build_flags = ${esp32_base.build_flags} -DFEATURE_ARDUINO_OTA=1 @@ -58,6 +57,9 @@ extra_scripts = ${esp32s3_common.extra_scripts} [env:normal_ESP32s3_4M316k_CDC] extends = esp32s3_common board = esp32s3cdc-qio_qspi +lib_ignore = ${esp32s3_common.lib_ignore} + ${no_ir.lib_ignore} + [env:collection_A_ESP32s3_4M316k_CDC] extends = esp32s3_common diff --git a/platformio_esp82xx_base.ini b/platformio_esp82xx_base.ini index f9a0895e5..799068c1e 100644 --- a/platformio_esp82xx_base.ini +++ b/platformio_esp82xx_base.ini @@ -93,6 +93,8 @@ platform_packages = ${regular_platform.platform_packages} build_flags = ${regular_platform.build_flags} -DBUILD_NO_DEBUG lib_ignore = ${regular_platform.lib_ignore} + ${no_ir.lib_ignore} + [normal_beta] @@ -101,7 +103,7 @@ platform_packages = ${beta_platform.platform_packages} build_flags = ${beta_platform.build_flags} -DBUILD_NO_DEBUG lib_ignore = ${beta_platform.lib_ignore} - + ${no_ir.lib_ignore} ;;; COLLECTION ******************************************************** ; additional plugins (and dependend code) that is marked as COLLECTION ; diff --git a/platformio_esp82xx_envs.ini b/platformio_esp82xx_envs.ini index 9dcbceeba..eae08cc8b 100644 --- a/platformio_esp82xx_envs.ini +++ b/platformio_esp82xx_envs.ini @@ -27,8 +27,7 @@ lib_ignore = ESP32_ping ESP32WebServer ESP32HTTPUpdateServer ServoESP32 - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} TinyWireM I2C AXP192 Power management EspSoftwareSerial @@ -43,8 +42,7 @@ lib_ignore = ESP32_ping ESP32WebServer ESP32HTTPUpdateServer ServoESP32 - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} TinyWireM I2C AXP192 Power management extra_scripts = pre:tools/pio/pre_custom_esp82xx.py @@ -260,8 +258,7 @@ lib_ignore = ESP32_ping ESP32WebServer ESP32HTTPUpdateServer ServoESP32 - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} TinyWireM ESP8266SdFat SD(esp8266) diff --git a/platformio_special_envs.ini b/platformio_special_envs.ini index 5abd75c3e..ec6315afe 100644 --- a/platformio_special_envs.ini +++ b/platformio_special_envs.ini @@ -24,8 +24,7 @@ build_flags = ${regular_platform.build_flags} ${esp8266_4M1M.build_flags} -DPLUGIN_BUILD_CUSTOM lib_ignore = ${regular_platform.lib_ignore} - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} LittleFS(esp8266) extra_scripts = ${extra_scripts_esp8266.extra_scripts} @@ -65,8 +64,7 @@ build_flags = ${beta_platform.build_flags} ${esp8266_4M1M.build_flags} -DPLUGIN_BUILD_CUSTOM lib_ignore = ${regular_platform.lib_ignore} - IRremoteESP8266 - HeatpumpIR + ${no_ir.lib_ignore} SD(esp8266) SD SDFS