feat(libs): Adjust scripts for split user libs#341
Merged
Conversation
74cd3d9 to
86c7cb3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This pull request refactors the library packaging and installation scripts to improve compatibility, clarity, and organization. The main changes include restructuring how ESP32 Arduino libraries are organized by variant, adding error handling, and updating merging and extraction logic.
Library structure and migration improvements:
The installation script (
copy-to-arduino.sh) now splits the monolithicesp32-arduino-libsfolder into per-variant folders (<variant>-libs), flattening the directory structure and making it easier to manage libraries for each SoC variant. Old layouts are removed to support migration.During installation, the script skips build/development files (such as
dependencies.lockandpioarduino-build.py) when copying libraries for each variant.Error handling and robustness:
Extraction and merging logic updates:
The artifact combination script (
combine-artifacts.sh) extracts the SoC name from each library archive and copies itsversions.txtto the corresponding SoC-specific folder before merging.The merging of
versions.txtfiles now usesgawkon macOS andawkelsewhere for compatibility, and paths are properly quoted to handle spaces.Packaging changes:
./*to include all files in the output tools directory, ensuring correct archiving of all contents.Related
espressif/arduino-esp32#12219