From c3eeeb3a4cb87c2ad6d0d4abcc735a81abed741f Mon Sep 17 00:00:00 2001 From: Richard Knoll Date: Wed, 18 Nov 2026 16:15:08 -0800 Subject: [PATCH] copy native build files from target, not file list --- pxtlib/shared/extensioninfo.ts | 21 ++++++++++++++-- tests/cli-test/clirunner.ts | 44 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/pxtlib/shared/extensioninfo.ts b/pxtlib/shared/extensioninfo.ts index a234c39d89b4..d78eb1e4447e 100644 --- a/pxtlib/shared/extensioninfo.ts +++ b/pxtlib/shared/extensioninfo.ts @@ -136,11 +136,14 @@ namespace pxt.cpp { * Generates native extension files from pxt.json and project files, with dependencies * under pxt_modules//. Dependencies resolve by directory, pxt.json name, * or their prefix before "---". + * Bundled packages supply missing Makefile, sdkconfig.defaults, and CMakeLists.txt files. * The target must not have variant overrides applied. * @example getExtensionInfo({ "pxt.json": config, "main.cpp": source }, target, "v2", host) */ export function getExtensionInfo(files: Map, target: TargetBundle, variant: string, host: ExtensionInfoHost): pxtc.ExtensionInfo { const appTarget = getAppTargetVariant(target, variant); + const bundledPackages = appTarget.bundledpkgs || {}; + const bundledBuildFiles = ["Makefile", "sdkconfig.defaults", "CMakeLists.txt"]; const constsName = "dal.d.ts" let sourcePath = "/source/" let disabledDeps = "" @@ -170,8 +173,14 @@ namespace pxt.cpp { U.userError(`extension ${id} matches multiple directories: ${paths.join(", ")}`); return paths && paths[0]; }; - const readFile = (pkg: ExtensionPackage, name: string): string => - files[pkg.path + name]; + const readFile = (pkg: ExtensionPackage, name: string): string => { + if (bundledBuildFiles.indexOf(name) >= 0 && pkg.path) { + const id = pkg.path.slice("pxt_modules/".length, -1); + const bundledFile = bundledPackages[id] && bundledPackages[id][name]; + if (bundledFile != null) return bundledFile; + } + return files[pkg.path + name]; + }; const dependencies = (pkg: ExtensionPackage): Map => packageUtils.getConfigDependencies( pkg.config, pkg.id == "this", @@ -217,6 +226,14 @@ namespace pxt.cpp { id => !!runtimePackages[resolvePath(id)], condition => host.logger.log(`invalid dependency expression: ${condition} in ${pkg.id}`) ); + if (pkg.path) { + const id = pkg.path.slice("pxt_modules/".length, -1); + const bundledFiles = bundledPackages[id]; + for (const name of bundledBuildFiles) { + if (bundledFiles && bundledFiles[name] != null && pkg.files.indexOf(name) < 0) + pkg.files.push(name); + } + } } const mainDeps: ExtensionPackage[] = []; diff --git a/tests/cli-test/clirunner.ts b/tests/cli-test/clirunner.ts index 3d48d7903f42..7ffe3b08c0fc 100644 --- a/tests/cli-test/clirunner.ts +++ b/tests/cli-test/clirunner.ts @@ -624,6 +624,50 @@ ${member} chai.expect(disabled.functions).deep.equals([]); }); + it("restores bundled build files filtered out of backend requests and ignores supplied overrides", () => { + const target = extensionTestTarget(); + const bundledFiles: pxt.Map = { + "pxt.json": JSON.stringify({ + name: "core", files: ["core.cpp", "Makefile", "sdkconfig.defaults", "CMakeLists.txt"], + dependencies: { support: "*" } + }), + "core.cpp": "// bundled source", + "Makefile": "# bundled make", + "sdkconfig.defaults": "CONFIG_BUNDLED=y", + "CMakeLists.txt": "# bundled cmake" + }; + target.bundledpkgs.core = bundledFiles; + target.bundledpkgs.support = { + "pxt.json": JSON.stringify({ name: "support", files: ["support.cpp"], dependencies: {} }), + "support.cpp": "// bundled support" + }; + const files: pxt.Map = { + "pxt.json": JSON.stringify({ name: "this", files: ["main.cpp"], dependencies: { core: "*" } }), + "main.cpp": "// project" + }; + for (const id of Object.keys(target.bundledpkgs)) { + for (const name of Object.keys(target.bundledpkgs[id])) + files[`pxt_modules/${id}/${name}`] = target.bundledpkgs[id][name]; + } + const request = createExtensionRequest(files, target, undefined); + for (const name of ["Makefile", "sdkconfig.defaults", "CMakeLists.txt"]) + chai.expect(request.files["pxt_modules/core/" + name]).equals(undefined); + request.files["pxt_modules/core/core.cpp"] = "// supplied override"; + request.files["pxt_modules/core/Makefile"] = "# supplied override"; + const original = JSON.stringify({ files: request.files, target }); + const result = pxt.cpp.getExtensionInfo(request.files, target, undefined, host); + for (const name of ["Makefile", "sdkconfig.defaults", "CMakeLists.txt"]) + chai.expect(result.generatedFiles["/" + name]).equals(bundledFiles[name]); + chai.expect(result.extensionFiles["/pxtapp/core/core.cpp"]).equals("// supplied override"); + chai.expect(result.extensionFiles["/pxtapp/support/support.cpp"]).equals("// bundled support"); + chai.expect(result.extensionFiles["/pxtapp/this/main.cpp"]).equals("// project"); + chai.expect(JSON.stringify({ files: request.files, target })).equals(original); + bundledFiles["sdkconfig.defaults"] = "CONFIG_CHANGED=y"; + const changed = pxt.cpp.getExtensionInfo(request.files, target, undefined, host); + chai.expect(changed.generatedFiles["/sdkconfig.defaults"]).equals("CONFIG_CHANGED=y"); + chai.expect(changed.sha).not.equals(result.sha); + }); + it("does not reuse stale or caller-mutated results for changed native inputs", () => { const target = extensionTestTarget(); const files = extensionTestFiles();