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

Port firmwaremake*.js to metadata.json

pull/1323/head
Adam Schmalhofer 2022-01-19 16:52:52 +01:00
parent 7102061614
commit 38170905ca
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/firmwaremaker.js
View File

@ -10,7 +10,6 @@ var SETTINGS = {
var path = require('path'); var path = require('path');
var ROOTDIR = path.join(__dirname, '..'); var ROOTDIR = path.join(__dirname, '..');
var APPDIR = ROOTDIR+'/apps'; var APPDIR = ROOTDIR+'/apps';
var APPJSON = ROOTDIR+'/apps.json';
var OUTFILE = ROOTDIR+'/firmware.js'; var OUTFILE = ROOTDIR+'/firmware.js';
var DEVICE = "BANGLEJS"; var DEVICE = "BANGLEJS";
var APPS = [ // IDs of apps to install var APPS = [ // IDs of apps to install
@ -28,7 +27,6 @@ global.Const = {
}; };
var AppInfo = require(ROOTDIR+"/core/js/appinfo.js"); var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
var appjson = JSON.parse(fs.readFileSync(APPJSON).toString());
var appfiles = []; var appfiles = [];
function fileGetter(url) { function fileGetter(url) {
@ -58,8 +56,11 @@ function fileGetter(url) {
} }
Promise.all(APPS.map(appid => { Promise.all(APPS.map(appid => {
var app = appjson.find(app=>app.id==appid); try {
if (app===undefined) throw new Error(`App ${appid} not found`); var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "metadata.json").toString());
} catch (e) {
throw new Error(`App ${appid} not found`);
}
return AppInfo.getFiles(app, { return AppInfo.getFiles(app, {
fileGetter : fileGetter, fileGetter : fileGetter,
settings : SETTINGS, settings : SETTINGS,

9
bin/firmwaremaker_c.js
View File

@ -16,7 +16,6 @@ var DEVICE = process.argv[2];
var path = require('path'); var path = require('path');
var ROOTDIR = path.join(__dirname, '..'); var ROOTDIR = path.join(__dirname, '..');
var APPDIR = ROOTDIR+'/apps'; var APPDIR = ROOTDIR+'/apps';
var APPJSON = ROOTDIR+'/apps.json';
var MINIFY = true; var MINIFY = true;
var OUTFILE, APPS; var OUTFILE, APPS;
@ -86,7 +85,6 @@ function atob(input) {
} }
var AppInfo = require(ROOTDIR+"/core/js/appinfo.js"); var AppInfo = require(ROOTDIR+"/core/js/appinfo.js");
var appjson = JSON.parse(fs.readFileSync(APPJSON).toString());
var appfiles = []; var appfiles = [];
function fileGetter(url) { function fileGetter(url) {
@ -134,8 +132,11 @@ function evaluateFile(file) {
} }
Promise.all(APPS.map(appid => { Promise.all(APPS.map(appid => {
var app = appjson.find(app=>app.id==appid); try {
if (app===undefined) throw new Error(`App ${appid} not found`); var app = JSON.parse(fs.readFileSync(APPDIR + "/" + appid + "metadata.json").toString());
} catch (e) {
throw new Error(`App ${appid} not found`);
}
return AppInfo.getFiles(app, { return AppInfo.getFiles(app, {
fileGetter : fileGetter, fileGetter : fileGetter,
settings : SETTINGS, settings : SETTINGS,