Skip to content

Commit 3533f1d

Browse files
committed
fbt: explicitly globbing libs; dist: logging SDK path
1 parent 8d7d32d commit 3533f1d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

firmware.scons

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fwenv.PrepareApplicationsBuild()
143143
# Build external apps + configure SDK
144144
if env["IS_BASE_FIRMWARE"]:
145145
# Ensure all libs are built - even if they are not used in firmware
146-
fw_artifacts.append(fwenv["LIB_DIST_DIR"])
146+
fw_artifacts.append(fwenv.GlobRecursive("*", fwenv["LIB_DIST_DIR"]))
147147

148148
fwenv.SetDefault(FBT_FAP_DEBUG_ELF_ROOT=fwenv["BUILD_DIR"].Dir(".extapps"))
149149
fw_extapps = fwenv["FW_EXTAPPS"] = SConscript(

scripts/sconsdist.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,9 @@ def bundle_sdk(self):
162162
"scripts.dir",
163163
)
164164

165+
sdk_bundle_path = self.get_dist_path(self.get_dist_file_name("sdk", "zip"))
165166
with zipfile.ZipFile(
166-
self.get_dist_path(self.get_dist_file_name("sdk", "zip")),
167+
sdk_bundle_path,
167168
"w",
168169
zipfile.ZIP_DEFLATED,
169170
) as zf:
@@ -205,6 +206,10 @@ def bundle_sdk(self):
205206
),
206207
)
207208

209+
self.logger.info(
210+
fg.boldgreen(f"SDK bundle can be found at:\n\t{sdk_bundle_path}")
211+
)
212+
208213
def bundle_update_package(self):
209214
self.logger.debug(
210215
f"Generating update bundle with version {self.args.version} for {self.target}"

0 commit comments

Comments
 (0)