Skip to content

Commit

Permalink
fbt: explicitly globbing libs; dist: logging SDK path
Browse files Browse the repository at this point in the history
  • Loading branch information
hedger committed Feb 6, 2024
1 parent 8d7d32d commit 3533f1d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion firmware.scons
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ fwenv.PrepareApplicationsBuild()
# Build external apps + configure SDK
if env["IS_BASE_FIRMWARE"]:
# Ensure all libs are built - even if they are not used in firmware
fw_artifacts.append(fwenv["LIB_DIST_DIR"])
fw_artifacts.append(fwenv.GlobRecursive("*", fwenv["LIB_DIST_DIR"]))

fwenv.SetDefault(FBT_FAP_DEBUG_ELF_ROOT=fwenv["BUILD_DIR"].Dir(".extapps"))
fw_extapps = fwenv["FW_EXTAPPS"] = SConscript(
Expand Down
7 changes: 6 additions & 1 deletion scripts/sconsdist.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ def bundle_sdk(self):
"scripts.dir",
)

sdk_bundle_path = self.get_dist_path(self.get_dist_file_name("sdk", "zip"))
with zipfile.ZipFile(
self.get_dist_path(self.get_dist_file_name("sdk", "zip")),
sdk_bundle_path,
"w",
zipfile.ZIP_DEFLATED,
) as zf:
Expand Down Expand Up @@ -205,6 +206,10 @@ def bundle_sdk(self):
),
)

self.logger.info(
fg.boldgreen(f"SDK bundle can be found at:\n\t{sdk_bundle_path}")
)

def bundle_update_package(self):
self.logger.debug(
f"Generating update bundle with version {self.args.version} for {self.target}"
Expand Down

0 comments on commit 3533f1d

Please sign in to comment.