FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

use slightly slower code to deal with the fact that many apps put semi-colons on clockinfo/settings that are supposed to be evaluated

pull/3624/head
Gordon Williams 2024-10-24 20:09:19 +01:00
parent 1ec8fba5ba
commit 9185793042
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/boot/bootupdate.js
View File

@ -133,7 +133,7 @@ let outputFile = (dst,src,pre,post) => {"ram";
if (src.endsWith("clkinfo.js") && f[0]!="(") { if (src.endsWith("clkinfo.js") && f[0]!="(") {
/* we shouldn't have to do this but it seems sometimes (sched 0.28) folks have /* we shouldn't have to do this but it seems sometimes (sched 0.28) folks have
used libraries which get added into the clockinfo, and we can't use them directly used libraries which get added into the clockinfo, and we can't use them directly
to we have to rever back to eval. */ to we have to revert back to eval */
f = `eval(require('Storage').read(${E.toJS(src)}))`; f = `eval(require('Storage').read(${E.toJS(src)}))`;
} }
if (dst) { if (dst) {
@ -195,7 +195,7 @@ let ciFiles = require("Storage").list(/\.clkinfo\.js$/);
let ci = `// Made by bootupdate.js\n`; let ci = `// Made by bootupdate.js\n`;
if (DEBUG) ci+="var _tm=Date.now();"; if (DEBUG) ci+="var _tm=Date.now();";
outputFileComplete = (dst,fn) => { outputFileComplete = (dst,fn) => {
outputFile(dst,fn,"try{let a=",`(),b=menu.find(x=>x.name===a.name);if(b)b.items=b.items.concat(a.items)else menu=menu.concat(a);}catch(e){print(${E.toJS(fn)},e,e.stack)}\n`); outputFile(dst,fn,"try{let fn=",`;let a=fn(),b=menu.find(x=>x.name===a.name);if(b)b.items=b.items.concat(a.items)else menu=menu.concat(a);}catch(e){print(${E.toJS(fn)},e,e.stack)}\n`);
}; };
fileOffset = ci.length; fileOffset = ci.length;
ciFiles.forEach(fn=>outputFileComplete(undefined,fn)); // just get sizes ciFiles.forEach(fn=>outputFileComplete(undefined,fn)); // just get sizes