Skip to content

[FL-3629] fbt: reworked assets & resources handling #3160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
skotopes merged 23 commits into from
Oct 30, 2023
Merged

[FL-3629] fbt: reworked assets & resources handling #3160

skotopes merged 23 commits into from
Oct 30, 2023

Conversation

@hedger
Copy link
Member

@hedger hedger commented Oct 19, 2023 •
edited by skotopes
Loading

What's new

  • moved /firmware/targets dir to project root (/targets) in preparation for FL-3630
  • FL-3629 reworked SD card resource packaging:
    • removed assets/resources folder altogether
    • moved assets/resources components to owning applications: added resources parameter for application.fam
    • moved assets/unit_tests to unit_tests application
  • as a result,
    • no more stale files for other targets/build configs
    • now only packaging resources for apps in current build configuration
  • ./fbt flash_usb_full FIRMWARE_APP_SET=unit_tests now correctly deploys unit test data
    • it will also be cleanly removed on fw update
  • loader: now can start builtin apps by appid

Verification

  • test updater_package, fap_deploy, resources targets when modifying source files/assets and switching targets

Checklist (For Reviewer)

  • PR has description of feature/bug or link to Confluence/Jira task
  • Description contains actions to verify feature/bugfix
  • I've built this code, uploaded it to the device and verified feature/bugfix

@hedger hedger added WIP Work In Progress. Do not merge Build System & Scripts fbt, scripts and toolchain-related labels Oct 19, 2023
@github-actions
Copy link

github-actions bot commented Oct 19, 2023 •
edited
Loading

Compiled f7 firmware for commit 1370558b:

@hedger hedger force-pushed the hedger/3630-targets_rework branch from 039d7df to 64c7dad Compare October 25, 2023 14:21
@hedger hedger changed the title fbt: reworking targets & assets handling WIP [FL-3629] fbt: reworked assets & resources handling Oct 25, 2023
@hedger hedger marked this pull request as ready for review October 25, 2023 14:51
@hedger hedger removed the WIP Work In Progress. Do not merge label Oct 25, 2023
@skotopes skotopes merged commit 917410a into dev Oct 30, 2023
@skotopes skotopes deleted the hedger/3630-targets_rework branch October 30, 2023 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DrZlo13 DrZlo13 Awaiting requested review from DrZlo13 DrZlo13 is a code owner

@drunkbatya drunkbatya Awaiting requested review from drunkbatya

@gsurkov gsurkov Awaiting requested review from gsurkov gsurkov is a code owner

@nminaylov nminaylov Awaiting requested review from nminaylov nminaylov is a code owner

@gornekich gornekich Awaiting requested review from gornekich gornekich is a code owner

@Astrrra Astrrra Awaiting requested review from Astrrra

@Skorpionm Skorpionm Awaiting requested review from Skorpionm Skorpionm is a code owner

1 more reviewer

@skotopes skotopes skotopes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Build System & Scripts fbt, scripts and toolchain-related

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hedger @skotopes