xs-dev 1.7.1 → 1.7.2--canary.245.968fba7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/package.json +1 -1
- package/build/src/commands/doctor.js +8 -2
- package/build/src/commands/setup.js +28 -7
- package/build/src/commands/teardown.js +35 -5
- package/build/src/commands/update.js +37 -5
- package/build/src/lib/toolchain.js +2 -0
- package/build/src/toolbox/build/index.js +24 -60
- package/build/src/toolbox/doctor/index.js +13 -51
- package/build/src/toolbox/scan/index.js +6 -21
- package/build/src/toolbox/setup/windows.js +3 -265
- package/build/src/toolbox/system/exec.js +8 -1
- package/build/src/toolbox/toolchains/context.js +19 -0
- package/build/src/toolbox/toolchains/esp32/index.js +397 -0
- package/build/src/toolbox/toolchains/esp32/linux.js +47 -0
- package/build/src/toolbox/{setup → toolchains}/esp32/mac.js +3 -3
- package/build/src/toolbox/toolchains/esp32/windows.js +47 -0
- package/build/src/toolbox/toolchains/esp8266.js +412 -0
- package/build/src/toolbox/toolchains/interface.js +2 -0
- package/build/src/toolbox/toolchains/moddable/index.js +98 -0
- package/build/src/toolbox/toolchains/moddable/lin.js +441 -0
- package/build/src/toolbox/toolchains/moddable/mac.js +433 -0
- package/build/src/toolbox/toolchains/moddable/windows.js +304 -0
- package/build/src/toolbox/toolchains/nrf52.js +267 -0
- package/build/src/toolbox/toolchains/pico.js +542 -0
- package/build/src/toolbox/toolchains/registry.js +25 -0
- package/build/src/toolbox/toolchains/wasm.js +279 -0
- package/build/src/toolbox/toolchains/zephyr.js +360 -0
- package/build/types/src/lib/toolchain.d.ts +24 -0
- package/build/types/src/toolbox/doctor/index.d.ts +5 -1
- package/build/types/src/toolbox/setup/types.d.ts +1 -1
- package/build/types/src/toolbox/setup/windows.d.ts +1 -4
- package/build/types/src/toolbox/system/exec.d.ts +5 -0
- package/build/types/src/toolbox/toolchains/context.d.ts +2 -0
- package/build/types/src/toolbox/toolchains/esp32/index.d.ts +3 -0
- package/build/types/src/toolbox/{setup → toolchains}/esp32/linux.d.ts +1 -1
- package/build/types/src/toolbox/{setup/pico → toolchains/esp32}/mac.d.ts +1 -1
- package/build/types/src/toolbox/{setup → toolchains}/esp32/windows.d.ts +1 -1
- package/build/types/src/toolbox/toolchains/esp8266.d.ts +2 -0
- package/build/types/src/toolbox/toolchains/interface.d.ts +1 -0
- package/build/types/src/toolbox/toolchains/moddable/index.d.ts +7 -0
- package/build/types/src/toolbox/toolchains/moddable/lin.d.ts +7 -0
- package/build/types/src/toolbox/toolchains/moddable/mac.d.ts +7 -0
- package/build/types/src/toolbox/toolchains/moddable/windows.d.ts +7 -0
- package/build/types/src/toolbox/toolchains/nrf52.d.ts +2 -0
- package/build/types/src/toolbox/toolchains/pico.d.ts +2 -0
- package/build/types/src/toolbox/toolchains/registry.d.ts +4 -0
- package/build/types/src/toolbox/toolchains/wasm.d.ts +2 -0
- package/build/types/src/toolbox/toolchains/zephyr.d.ts +2 -0
- package/package.json +1 -1
- package/build/src/toolbox/setup/esp32/linux.js +0 -47
- package/build/src/toolbox/setup/esp32/windows.js +0 -54
- package/build/src/toolbox/setup/esp32.js +0 -190
- package/build/src/toolbox/setup/esp8266/linux.js +0 -42
- package/build/src/toolbox/setup/esp8266/mac.js +0 -74
- package/build/src/toolbox/setup/esp8266/windows.js +0 -118
- package/build/src/toolbox/setup/esp8266.js +0 -163
- package/build/src/toolbox/setup/lin.js +0 -230
- package/build/src/toolbox/setup/mac.js +0 -204
- package/build/src/toolbox/setup/nrf52/windows.js +0 -40
- package/build/src/toolbox/setup/nrf52.js +0 -169
- package/build/src/toolbox/setup/pico/linux.js +0 -23
- package/build/src/toolbox/setup/pico/mac.js +0 -62
- package/build/src/toolbox/setup/pico.js +0 -267
- package/build/src/toolbox/setup/wasm.js +0 -223
- package/build/src/toolbox/setup/zephyr/linux.js +0 -25
- package/build/src/toolbox/setup/zephyr/mac.js +0 -36
- package/build/src/toolbox/setup/zephyr/windows.js +0 -29
- package/build/src/toolbox/setup/zephyr.js +0 -226
- package/build/src/toolbox/teardown/index.js +0 -37
- package/build/src/toolbox/update/esp32.js +0 -186
- package/build/src/toolbox/update/esp8266.js +0 -7
- package/build/src/toolbox/update/lin.js +0 -214
- package/build/src/toolbox/update/mac.js +0 -220
- package/build/src/toolbox/update/nrf52.js +0 -4
- package/build/src/toolbox/update/pico.js +0 -162
- package/build/src/toolbox/update/wasm.js +0 -4
- package/build/src/toolbox/update/windows.js +0 -7
- package/build/types/src/toolbox/setup/esp32/mac.d.ts +0 -3
- package/build/types/src/toolbox/setup/esp32.d.ts +0 -4
- package/build/types/src/toolbox/setup/esp8266/linux.d.ts +0 -3
- package/build/types/src/toolbox/setup/esp8266/mac.d.ts +0 -3
- package/build/types/src/toolbox/setup/esp8266/windows.d.ts +0 -3
- package/build/types/src/toolbox/setup/esp8266.d.ts +0 -3
- package/build/types/src/toolbox/setup/lin.d.ts +0 -4
- package/build/types/src/toolbox/setup/mac.d.ts +0 -4
- package/build/types/src/toolbox/setup/nrf52/windows.d.ts +0 -3
- package/build/types/src/toolbox/setup/nrf52.d.ts +0 -3
- package/build/types/src/toolbox/setup/pico/linux.d.ts +0 -3
- package/build/types/src/toolbox/setup/pico.d.ts +0 -3
- package/build/types/src/toolbox/setup/wasm.d.ts +0 -3
- package/build/types/src/toolbox/setup/zephyr/linux.d.ts +0 -3
- package/build/types/src/toolbox/setup/zephyr/mac.d.ts +0 -3
- package/build/types/src/toolbox/setup/zephyr/windows.d.ts +0 -3
- package/build/types/src/toolbox/setup/zephyr.d.ts +0 -3
- package/build/types/src/toolbox/teardown/index.d.ts +0 -1
- package/build/types/src/toolbox/update/esp32.d.ts +0 -3
- package/build/types/src/toolbox/update/esp8266.d.ts +0 -3
- package/build/types/src/toolbox/update/lin.d.ts +0 -3
- package/build/types/src/toolbox/update/mac.d.ts +0 -3
- package/build/types/src/toolbox/update/nrf52.d.ts +0 -3
- package/build/types/src/toolbox/update/pico.d.ts +0 -3
- package/build/types/src/toolbox/update/wasm.d.ts +0 -3
- package/build/types/src/toolbox/update/windows.d.ts +0 -3
package/build/package.json
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { buildCommand } from '@stricli/core';
|
|
2
2
|
import { gatherEnvironmentInfo } from '../toolbox/doctor/index.js';
|
|
3
|
+
import { toolchains } from '../toolbox/toolchains/registry.js';
|
|
4
|
+
import { getHostContext } from '../toolbox/toolchains/context.js';
|
|
3
5
|
function printTable(rows, write) {
|
|
4
6
|
const labelWidth = Math.max(...rows.map((r) => r[0]?.length ?? 0)) + 2;
|
|
5
7
|
for (const [label, value] of rows) {
|
|
@@ -12,7 +14,11 @@ const command = buildCommand({
|
|
|
12
14
|
const write = (s) => {
|
|
13
15
|
proc.stdout.write(s);
|
|
14
16
|
};
|
|
15
|
-
const
|
|
17
|
+
const ctx = getHostContext();
|
|
18
|
+
const info = await gatherEnvironmentInfo(currentVersion, {
|
|
19
|
+
adapterList: Object.values(toolchains),
|
|
20
|
+
ctx,
|
|
21
|
+
});
|
|
16
22
|
write('xs-dev environment info:\n');
|
|
17
23
|
printTable([
|
|
18
24
|
['CLI Version', info.cliVersion],
|
|
@@ -65,4 +71,4 @@ const command = buildCommand({
|
|
|
65
71
|
},
|
|
66
72
|
});
|
|
67
73
|
export default command;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9jdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL2RvY3Rvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTVDLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ2xFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFFakUsU0FBUyxVQUFVLENBQUMsSUFBZ0IsRUFBRSxLQUEwQjtJQUM5RCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN0RSxLQUFLLE1BQU0sQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7UUFDbEMsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFLLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEtBQUssSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQ2hFLENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxPQUFPLEdBQUcsWUFBWSxDQUFDO0lBQzNCLEtBQUssQ0FBQyxJQUFJO1FBQ1IsTUFBTSxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFBO1FBQzlDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBUyxFQUFRLEVBQUU7WUFDaEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDdEIsQ0FBQyxDQUFBO1FBRUQsTUFBTSxH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
|
|
@@ -3,16 +3,21 @@ import ora from 'ora';
|
|
|
3
3
|
import { buildCommand } from '@stricli/core';
|
|
4
4
|
import setupEjectfix from '../toolbox/setup/ejectfix.js';
|
|
5
5
|
import { DEVICE_ALIAS } from '../toolbox/prompt/devices.js';
|
|
6
|
-
import { MODDABLE_REPO } from '../toolbox/setup/constants.js';
|
|
7
6
|
import { createInteractivePrompter, createNonInteractivePrompter, isInteractive, } from '../lib/prompter.js';
|
|
8
7
|
import { handleEvent } from '../lib/renderer.js';
|
|
8
|
+
import { getToolchain } from '../toolbox/toolchains/registry.js';
|
|
9
|
+
import { getHostContext } from '../toolbox/toolchains/context.js';
|
|
10
|
+
function buildVersionString(release, branch, sourceRepo) {
|
|
11
|
+
const prefix = branch !== undefined ? `branch-${branch}` : `release-${release ?? 'latest'}`;
|
|
12
|
+
return sourceRepo !== undefined ? `${prefix}@${sourceRepo}` : prefix;
|
|
13
|
+
}
|
|
9
14
|
const command = buildCommand({
|
|
10
15
|
docs: {
|
|
11
16
|
brief: 'Download and build Moddable tooling for various platform targets',
|
|
12
17
|
},
|
|
13
18
|
async func(flags) {
|
|
14
19
|
const currentPlatform = platformType().toLowerCase();
|
|
15
|
-
const { device, 'list-devices': listDevices = false, tool, branch, release = 'latest', 'source-repo': sourceRepo
|
|
20
|
+
const { device, 'list-devices': listDevices = false, tool, branch, release = 'latest', 'source-repo': sourceRepo, interactive = true, } = flags;
|
|
16
21
|
// Determine interactive mode and create prompter
|
|
17
22
|
const prompter = isInteractive(interactive)
|
|
18
23
|
? createInteractivePrompter()
|
|
@@ -59,16 +64,32 @@ const command = buildCommand({
|
|
|
59
64
|
'lin',
|
|
60
65
|
'linux',
|
|
61
66
|
];
|
|
62
|
-
const { default: setup } = await import(`../toolbox/setup/${target}.js`);
|
|
63
67
|
const spinner = ora();
|
|
64
68
|
if (platformDevices.includes(target)) {
|
|
65
|
-
|
|
69
|
+
const toolchain = getToolchain('moddable');
|
|
70
|
+
if (toolchain === undefined) {
|
|
71
|
+
console.warn('Moddable toolchain not found');
|
|
72
|
+
process.exit(1);
|
|
73
|
+
}
|
|
74
|
+
const version = buildVersionString(release, branch, sourceRepo);
|
|
75
|
+
const ctx = { ...getHostContext(), version };
|
|
76
|
+
for await (const event of toolchain.install(ctx, prompter)) {
|
|
66
77
|
handleEvent(event, spinner);
|
|
67
78
|
}
|
|
68
79
|
}
|
|
69
80
|
else {
|
|
70
|
-
|
|
71
|
-
|
|
81
|
+
const toolchain = getToolchain(target);
|
|
82
|
+
if (toolchain !== undefined) {
|
|
83
|
+
const ctx = getHostContext();
|
|
84
|
+
for await (const event of toolchain.install(ctx, prompter)) {
|
|
85
|
+
handleEvent(event, spinner);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
handleEvent({
|
|
90
|
+
type: 'step:fail',
|
|
91
|
+
message: `No toolchain registered for device: ${target}`,
|
|
92
|
+
}, spinner);
|
|
72
93
|
}
|
|
73
94
|
}
|
|
74
95
|
},
|
|
@@ -118,4 +139,4 @@ const command = buildCommand({
|
|
|
118
139
|
},
|
|
119
140
|
});
|
|
120
141
|
export default command;
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvc2V0dXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksSUFBSSxZQUFZLEVBQUUsTUFBTSxTQUFTLENBQUE7QUFDOUMsT0FBTyxHQUFHLE1BQU0sS0FBSyxDQUFBO0FBQ3JCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFHNUMsT0FBTyxhQUFhLE1BQU0sOEJBQThCLENBQUE7QUFDeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFBO0FBRTNELE9BQU8sRUFDTCx5QkFBeUIsRUFDekIsNEJBQTRCLEVBQzVCLGFBQWEsR0FDZCxNQUFNLG9CQUFvQixDQUFBO0FBQzNCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUNBQW1DLENBQUE7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBRWpFLFNBQVMsa0JBQWtCLENBQ3pCLE9BQTJCLEVBQzNCLE1BQTBCLEVBQzFCLFVBQThCO0lBRTlCLE1BQU0sTUFBTSxHQUNWLE1BQU0sS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLFVBQVUsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVcsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFBO0lBQzlFLE9BQU8sVUFBVSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLElBQUksVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQTtBQUN0RSxDQUFDO0FBWUQsTUFBTSxPQUFPLEdBQUcsWUFBWSxDQUFDO0lBQzNCLElBQUksRUFBRTtRQUNKLEtBQUssRUFBRSxrRUFBa0U7S0FDMUU7SUFDRCxLQUFLLENBQUMsSUFBSSxDQUFxQixLQUFtQjtRQUNoRCxNQUFNLGVBQWUsR0FBVyxZQUFZLEVBQUUsQ0FBQyxXQUFXLEVBQVksQ0FBQTtRQUN0RSxNQUFNLEVBQ0osTUFBTSxFQUNOLGNBQWMsRUFBRSxXQUFXLEdBQUcsS0FBSyxFQUNuQyxJQUFJLEVBQ0osTUFBTSxFQUNOLE9BQU8sR0FBRyxRQUFRLEVBQ2xCLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFdBQVcsR0FBRyxJQUFJLEdBQ25CLEdBQUcsS0FBSyxDQUFBO1FBRVQsaURBQWlEO1FBQ2pELE1BQU0sUUFBUSxHQUFHLGFBQWEsQ0FBQyxXQUFXLENBQUM7WUFDekMsQ0FBQyxDQUFDLHlCQUF5QixFQUFFO1lBQzdCLENBQUMsQ0FBQyw0QkFBNEIsRUFBRSxDQUFBO1FBRWxDLElBQUksTUFBTSxHQUNSLFlBQVksQ0FBQyxNQUFNLElBQUssRUFBYSxDQUFDLElBQUksWUFBWSxDQUFDLGVBQWUsQ0FBQyxDQUFBO1FBRXpFLElBQUksTUFBTSxLQUFLLFNBQVMsSUFBSSxXQUFXLEVBQUUsQ0FBQztZQUN4QyxNQUFNLE9BQU8sR0FBRztnQkFDZCxTQUFTO2dCQUNULE9BQU87Z0JBQ1AsTUFBTTtnQkFDTixNQUFNO2dCQUNOLE9BQU87Z0JBQ1AsUUFBUTtnQkFDUixZQUFZLENBQUMsZUFBZSxDQUFDO2FBQzlCLENBQUE7WUFDRCxNQUFNLGNBQWMsR0FBRyxNQUFNLFFBQVEsQ0FBQyxNQUFNLENBQzFDLHdDQUF3QyxFQUN4QyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUM3QyxDQUFBO1lBRUQsSUFBSSxjQUFjLEtBQUssRUFBRSxJQUFJLGNBQWMsS0FBSyxTQUFTLEVBQUUsQ0FBQztnQkFDMUQsTUFBTSxHQUFHLGNBQXdCLENBQUE7WUFDbkMsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxJQUFJLENBQUMsc0NBQXNDLENBQUMsQ0FBQTtnQkFDcEQsT0FBTTtZQUNSLENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDdkIsSUFBSSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7Z0JBQ2pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLElBQUksRUFBRSxDQUFDLENBQUE7Z0JBQ3BDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7WUFDakIsQ0FBQztZQUNELElBQUksSUFBSSxLQUFLLFVBQVUsRUFBRSxDQUFDO2dCQUN4QixNQUFNLE9BQU8sR0FBRyxHQUFHLEVBQUUsQ0FBQTtnQkFDckIsSUFBSSxLQUFLLEVBQUUsTUFBTSxLQUFLLElBQUksYUFBYSxDQUFDLEVBQUUsRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDO29CQUN0RCxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFBO2dCQUM3QixDQUFDO1lBQ0gsQ0FBQztZQUNELE9BQU07UUFDUixDQUFDO1FBRUQsTUFBTSxlQUFlLEdBQWE7WUFDaEMsS0FBSztZQUNMLFFBQVE7WUFDUixZQUFZO1lBQ1osU0FBUztZQUNULEtBQUs7WUFDTCxLQUFLO1lBQ0wsT0FBTztTQUNSLENBQUE7UUFFRCxNQUFNLE9BQU8sR0FBRyxHQUFHLEVBQUUsQ0FBQTtRQUVyQixJQUFJLGVBQWUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQztZQUNyQyxNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLENBQUE7WUFDMUMsSUFBSSxTQUFTLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQzVCLE9BQU8sQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQTtnQkFDNUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUNqQixDQUFDO1lBQ0QsTUFBTSxPQUFPLEdBQUcsa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQTtZQUMvRCxNQUFNLEdBQUcsR0FBRyxFQUFFLEdBQUcsY0FBYyxFQUFFLEVBQUUsT0FBTyxFQUFFLENBQUE7WUFDNUMsSUFBSSxLQUFLLEVBQUUsTUFBTSxLQUFLLElBQUksU0FBUyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQztnQkFDM0QsV0FBVyxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQTtZQUM3QixDQUFDO1FBQ0gsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLFNBQVMsR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDdEMsSUFBSSxTQUFTLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQzVCLE1BQU0sR0FBRyxHQUFHLGNBQWMsRUFBRSxDQUFBO2dCQUM1QixJQUFJLEtBQUssRUFBRSxNQUFNLEtBQUssSUFBSSxTQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDO29CQUMzRCxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFBO2dCQUM3QixDQUFDO1lBQ0gsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLFdBQVcsQ0FDVDtvQkFDRSxJQUFJLEVBQUUsV0FBVztvQkFDakIsT0FBTyxFQUFFLHVDQUF1QyxNQUFNLEVBQUU7aUJBQ3pELEVBQ0QsT0FBTyxDQUNSLENBQUE7WUFDSCxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFDRCxVQUFVLEVBQUU7UUFDVixLQUFLLEVBQUU7WUFDTCxNQUFNLEVBQUU7Z0JBQ04sSUFBSSxFQUFFLE1BQU07Z0JBQ1osTUFBTSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUEwQjtnQkFDMUQsS0FBSyxFQUNILGdJQUFnSTtnQkFDbEksUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELGNBQWMsRUFBRTtnQkFDZCxJQUFJLEVBQUUsU0FBUztnQkFDZixLQUFLLEVBQ0gsK0VBQStFO2dCQUNqRixRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsSUFBSSxFQUFFO2dCQUNKLElBQUksRUFBRSxNQUFNO2dCQUNaLE1BQU0sRUFBRSxDQUFDLFVBQVUsQ0FBQztnQkFDcEIsS0FBSyxFQUFFLGdFQUFnRTtnQkFDdkUsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELE1BQU0sRUFBRTtnQkFDTixJQUFJLEVBQUUsUUFBUTtnQkFDZCxLQUFLLEVBQUUsTUFBTTtnQkFDYixLQUFLLEVBQUUsZ0VBQWdFO2dCQUN2RSxRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsT0FBTyxFQUFFO2dCQUNQLElBQUksRUFBRSxRQUFRO2dCQUNkLEtBQUssRUFBRSxNQUFNO2dCQUNiLEtBQUssRUFDSCxvRkFBb0Y7Z0JBQ3RGLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7WUFDRCxhQUFhLEVBQUU7Z0JBQ2IsSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsS0FBSyxFQUFFLE1BQU07Z0JBQ2IsS0FBSyxFQUNILGtHQUFrRztnQkFDcEcsUUFBUSxFQUFFLElBQUk7YUFDZjtZQUNELFdBQVcsRUFBRTtnQkFDWCxJQUFJLEVBQUUsU0FBUztnQkFDZixLQUFLLEVBQ0gsMkhBQTJIO2dCQUM3SCxRQUFRLEVBQUUsSUFBSTthQUNmO1NBQ0Y7S0FDRjtDQUNGLENBQUMsQ0FBQTtBQUVGLGVBQWUsT0FBTyxDQUFBIn0=
|
|
@@ -1,14 +1,44 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { readFile, writeFile } from 'node:fs/promises';
|
|
2
|
+
import { existsSync, rmSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
2
4
|
import ora from 'ora';
|
|
3
|
-
import {
|
|
5
|
+
import { buildCommand } from '@stricli/core';
|
|
6
|
+
import { toolchains } from '../toolbox/toolchains/registry.js';
|
|
7
|
+
import { getHostContext } from '../toolbox/toolchains/context.js';
|
|
8
|
+
import { createNonInteractivePrompter } from '../lib/prompter.js';
|
|
9
|
+
import { handleEvent } from '../lib/renderer.js';
|
|
10
|
+
import { EXPORTS_FILE_PATH, INSTALL_DIR, getProfilePath, } from '../toolbox/setup/constants.js';
|
|
4
11
|
const command = buildCommand({
|
|
5
12
|
docs: {
|
|
6
13
|
brief: 'Remove all installed git repos and toolchains, unset environment changes',
|
|
7
14
|
},
|
|
8
15
|
async func() {
|
|
9
16
|
const spinner = ora();
|
|
10
|
-
|
|
11
|
-
|
|
17
|
+
const ctx = getHostContext();
|
|
18
|
+
const prompter = createNonInteractivePrompter();
|
|
19
|
+
spinner.start('Tearing down platform dependencies');
|
|
20
|
+
for (const toolchain of Object.values(toolchains)) {
|
|
21
|
+
if (toolchain.platforms.includes(ctx.platform)) {
|
|
22
|
+
for await (const event of toolchain.teardown(ctx, prompter)) {
|
|
23
|
+
handleEvent(event, spinner);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
// Non-adapter cleanup: fontbm, exports file, shell profile
|
|
28
|
+
const remove = (path) => {
|
|
29
|
+
rmSync(path, { recursive: true, force: true });
|
|
30
|
+
};
|
|
31
|
+
remove(EXPORTS_FILE_PATH);
|
|
32
|
+
remove(join(INSTALL_DIR, 'fontbm'));
|
|
33
|
+
const profilePath = getProfilePath();
|
|
34
|
+
if (existsSync(profilePath)) {
|
|
35
|
+
const contents = await readFile(profilePath, 'utf8');
|
|
36
|
+
const patched = contents
|
|
37
|
+
.split('\n')
|
|
38
|
+
.filter((line) => line.trim() !== `source ${EXPORTS_FILE_PATH}`)
|
|
39
|
+
.join('\n');
|
|
40
|
+
await writeFile(profilePath, patched, 'utf8');
|
|
41
|
+
}
|
|
12
42
|
spinner.succeed('Clean up complete!');
|
|
13
43
|
},
|
|
14
44
|
parameters: {
|
|
@@ -16,4 +46,4 @@ const command = buildCommand({
|
|
|
16
46
|
},
|
|
17
47
|
});
|
|
18
48
|
export default command;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVhcmRvd24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZHMvdGVhcmRvd24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN0RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUM1QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBQ2hDLE9BQU8sR0FBRyxNQUFNLEtBQUssQ0FBQTtBQUNyQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTVDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hELE9BQU8sRUFDTCxpQkFBaUIsRUFDakIsV0FBVyxFQUNYLGNBQWMsR0FDZixNQUFNLCtCQUErQixDQUFBO0FBRXRDLE1BQU0sT0FBTyxHQUFHLFlBQVksQ0FBQztJQUMzQixJQUFJLEVBQUU7UUFDSixLQUFLLEVBQ0gsMEVBQTBFO0tBQzdFO0lBQ0QsS0FBSyxDQUFDLElBQUk7UUFDUixNQUFNLE9BQU8sR0FBRyxHQUFHLEVBQUUsQ0FBQTtRQUNyQixNQUFNLEdBQUcsR0FBRyxjQUFjLEVBQUUsQ0FBQTtRQUM1QixNQUFNLFFBQVEsR0FBRyw0QkFBNEIsRUFBRSxDQUFBO1FBRS9DLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0NBQW9DLENBQUMsQ0FBQTtRQUVuRCxLQUFLLE1BQU0sU0FBUyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUNsRCxJQUFJLFNBQVMsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO2dCQUMvQyxJQUFJLEtBQUssRUFBRSxNQUFNLEtBQUssSUFBSSxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDO29CQUM1RCxXQUFXLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFBO2dCQUM3QixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7UUFFRCwyREFBMkQ7UUFDM0QsTUFBTSxNQUFNLEdBQUcsQ0FBQyxJQUFZLEVBQVEsRUFBRTtZQUNwQyxNQUFNLENBQUMsSUFBSSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtRQUNoRCxDQUFDLENBQUE7UUFDRCxNQUFNLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtRQUN6QixNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFBO1FBRW5DLE1BQU0sV0FBVyxHQUFHLGNBQWMsRUFBRSxDQUFBO1FBQ3BDLElBQUksVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7WUFDNUIsTUFBTSxRQUFRLEdBQUcsTUFBTSxRQUFRLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxDQUFBO1lBQ3BELE1BQU0sT0FBTyxHQUFHLFFBQVE7aUJBQ3JCLEtBQUssQ0FBQyxJQUFJLENBQUM7aUJBQ1gsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEtBQUssVUFBVSxpQkFBaUIsRUFBRSxDQUFDO2lCQUMvRCxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDYixNQUFNLFNBQVMsQ0FBQyxXQUFXLEVBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQy9DLENBQUM7UUFFRCxPQUFPLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUE7SUFDdkMsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLEtBQUssRUFBRSxFQUFFO0tBQ1Y7Q0FDRixDQUFDLENBQUE7QUFFRixlQUFlLE9BQU8sQ0FBQSJ9
|
|
@@ -4,6 +4,12 @@ import { buildCommand } from '@stricli/core';
|
|
|
4
4
|
import { DEVICE_ALIAS } from '../toolbox/prompt/devices.js';
|
|
5
5
|
import { createInteractivePrompter, createNonInteractivePrompter, isInteractive, } from '../lib/prompter.js';
|
|
6
6
|
import { handleEvent } from '../lib/renderer.js';
|
|
7
|
+
import { getToolchain } from '../toolbox/toolchains/registry.js';
|
|
8
|
+
import { getHostContext } from '../toolbox/toolchains/context.js';
|
|
9
|
+
function buildVersionString(release, branch, sourceRepo) {
|
|
10
|
+
const prefix = branch !== undefined ? `branch-${branch}` : `release-${release ?? 'latest'}`;
|
|
11
|
+
return sourceRepo !== undefined ? `${prefix}@${sourceRepo}` : prefix;
|
|
12
|
+
}
|
|
7
13
|
const command = buildCommand({
|
|
8
14
|
docs: {
|
|
9
15
|
brief: 'Check and update Moddable tooling for various platform targets',
|
|
@@ -14,10 +20,36 @@ const command = buildCommand({
|
|
|
14
20
|
const prompter = isInteractive(interactive)
|
|
15
21
|
? createInteractivePrompter()
|
|
16
22
|
: createNonInteractivePrompter();
|
|
17
|
-
const
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
23
|
+
const platformDevices = ['mac', 'lin', 'windows'];
|
|
24
|
+
const resolvedTarget = DEVICE_ALIAS[device];
|
|
25
|
+
if (platformDevices.includes(resolvedTarget)) {
|
|
26
|
+
const toolchain = getToolchain('moddable');
|
|
27
|
+
if (toolchain === undefined) {
|
|
28
|
+
console.warn('Moddable toolchain not found');
|
|
29
|
+
process.exit(1);
|
|
30
|
+
}
|
|
31
|
+
const version = buildVersionString(release, branch, undefined);
|
|
32
|
+
const ctx = { ...getHostContext(), version };
|
|
33
|
+
const spinner = ora();
|
|
34
|
+
for await (const event of toolchain.update(ctx, prompter)) {
|
|
35
|
+
handleEvent(event, spinner);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
const deviceToolchain = getToolchain(resolvedTarget);
|
|
40
|
+
const spinner = ora();
|
|
41
|
+
if (deviceToolchain !== undefined) {
|
|
42
|
+
const ctx = getHostContext();
|
|
43
|
+
for await (const event of deviceToolchain.update(ctx, prompter)) {
|
|
44
|
+
handleEvent(event, spinner);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
handleEvent({
|
|
49
|
+
type: 'step:fail',
|
|
50
|
+
message: `No toolchain registered for device: ${resolvedTarget}`,
|
|
51
|
+
}, spinner);
|
|
52
|
+
}
|
|
21
53
|
}
|
|
22
54
|
},
|
|
23
55
|
parameters: {
|
|
@@ -49,4 +81,4 @@ const command = buildCommand({
|
|
|
49
81
|
},
|
|
50
82
|
});
|
|
51
83
|
export default command;
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3VwZGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsSUFBSSxJQUFJLFlBQVksRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUM5QyxPQUFPLEdBQUcsTUFBTSxLQUFLLENBQUE7QUFDckIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUc1QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sOEJBQThCLENBQUE7QUFDM0QsT0FBTyxFQUNMLHlCQUF5QixFQUN6Qiw0QkFBNEIsRUFDNUIsYUFBYSxHQUNkLE1BQU0sb0JBQW9CLENBQUE7QUFDM0IsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQTtBQUNoRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFFakUsU0FBUyxrQkFBa0IsQ0FDekIsT0FBMkIsRUFDM0IsTUFBMEIsRUFDMUIsVUFBOEI7SUFFOUIsTUFBTSxNQUFNLEdBQ1YsTUFBTSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsVUFBVSxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxPQUFPLElBQUksUUFBUSxFQUFFLENBQUE7SUFDOUUsT0FBTyxVQUFVLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sSUFBSSxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFBO0FBQ3RFLENBQUM7QUFTRCxNQUFNLE9BQU8sR0FBRyxZQUFZLENBQUM7SUFDM0IsSUFBSSxFQUFFO1FBQ0osS0FBSyxFQUFFLGdFQUFnRTtLQUN4RTtJQUNELEtBQUssQ0FBQyxJQUFJLENBQXFCLEtBQW9CO1FBQ2pELE1BQU0sZUFBZSxHQUFXLFlBQVksRUFBRSxDQUFDLFdBQVcsRUFBWSxD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
|
|
@@ -7,7 +7,9 @@ import { execaCommand } from 'execa';
|
|
|
7
7
|
import { collectChoicesFromTree } from '../prompt/choices.js';
|
|
8
8
|
import { moddableExists } from '../setup/moddable.js';
|
|
9
9
|
import { DEVICE_ALIAS } from '../prompt/devices.js';
|
|
10
|
-
import { sourceEnvironment,
|
|
10
|
+
import { sourceEnvironment, which, sourceScript } from '../system/exec.js';
|
|
11
|
+
import { getHostContext } from '../toolchains/context.js';
|
|
12
|
+
import { resolveToolchain } from '../toolchains/registry.js';
|
|
11
13
|
const DEPLOY_TARGET = Object.freeze({
|
|
12
14
|
clean: 'clean',
|
|
13
15
|
debug: 'xsbug',
|
|
@@ -46,6 +48,7 @@ async function* inspectTree(dirPath) {
|
|
|
46
48
|
export default async function* build({ listDevices, port, example, listExamples, log = false, projectPath, targetPlatform, mode, deployStatus, outputDir, config = {}, }, prompter) {
|
|
47
49
|
const OS = platformType().toLowerCase();
|
|
48
50
|
await sourceEnvironment();
|
|
51
|
+
const ctx = getHostContext();
|
|
49
52
|
if (!moddableExists()) {
|
|
50
53
|
yield {
|
|
51
54
|
type: 'step:fail',
|
|
@@ -86,64 +89,25 @@ export default async function* build({ listDevices, port, example, listExamples,
|
|
|
86
89
|
}
|
|
87
90
|
if (targetPlatform !== '') {
|
|
88
91
|
const startsWithSimulator = targetPlatform.startsWith('simulator');
|
|
89
|
-
if (
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (targetPlatform.includes('wasm') && !startsWithSimulator) {
|
|
109
|
-
if (!(process.env.PATH ?? '').includes('binaryen') ||
|
|
110
|
-
typeof process.env.EMSDK !== 'string' ||
|
|
111
|
-
typeof process.env.EMSDK_NODE !== 'string' ||
|
|
112
|
-
typeof process.env.EMSDK_PYTHON !== 'string') {
|
|
113
|
-
yield {
|
|
114
|
-
type: 'step:fail',
|
|
115
|
-
message: 'The current environment does not appear to be set up for the wasm build target. Please run `xs-dev setup --device wasm` before trying again.',
|
|
116
|
-
};
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
if (targetPlatform.includes('pico') && !startsWithSimulator) {
|
|
121
|
-
if (!(typeof process.env.PICO_SDK_PATH === 'string') ||
|
|
122
|
-
typeof process.env.PIOASM !== 'string') {
|
|
123
|
-
yield {
|
|
124
|
-
type: 'step:fail',
|
|
125
|
-
message: 'The current environment does not appear to be set up for the pico build target. Please run `xs-dev setup --device pico` before trying again.',
|
|
126
|
-
};
|
|
127
|
-
return;
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
if (targetPlatform.includes('nrf52') && !startsWithSimulator) {
|
|
131
|
-
if (typeof process.env.NRF_ROOT !== 'string' ||
|
|
132
|
-
typeof process.env.NRF_SDK_DIR !== 'string') {
|
|
133
|
-
yield {
|
|
134
|
-
type: 'step:fail',
|
|
135
|
-
message: 'The current environment does not appear to be set up for the nrf52 build target. Please run `xs-dev setup --device nrf52` before trying again.',
|
|
136
|
-
};
|
|
137
|
-
return;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
if (targetPlatform.includes('zephyr') && !startsWithSimulator) {
|
|
141
|
-
if (typeof process.env.ZEPHYR_BASE !== 'string') {
|
|
142
|
-
yield {
|
|
143
|
-
type: 'step:fail',
|
|
144
|
-
message: 'The current environment does not appear to be set up for the zephyr build target. Please run `xs-dev setup --device zephyr` before trying again.',
|
|
145
|
-
};
|
|
146
|
-
return;
|
|
92
|
+
if (!startsWithSimulator) {
|
|
93
|
+
const toolchain = resolveToolchain(targetPlatform);
|
|
94
|
+
if (toolchain !== undefined) {
|
|
95
|
+
// Apply env vars from the toolchain so build tools are on PATH
|
|
96
|
+
Object.assign(process.env, toolchain.getEnvVars(ctx));
|
|
97
|
+
// Source activation script if toolchain provides one (e.g. ESP-IDF, Zephyr)
|
|
98
|
+
const script = toolchain.getActivationScript?.(ctx);
|
|
99
|
+
if (script !== undefined && script !== null) {
|
|
100
|
+
await sourceScript(script);
|
|
101
|
+
}
|
|
102
|
+
// Verify the toolchain is set up
|
|
103
|
+
const verifyResult = await toolchain.verify(ctx);
|
|
104
|
+
if (!verifyResult.ok) {
|
|
105
|
+
yield {
|
|
106
|
+
type: 'step:fail',
|
|
107
|
+
message: `The current environment does not appear to be set up for the ${toolchain.name} build target. Please run \`xs-dev setup --device ${toolchain.name}\` before trying again.`,
|
|
108
|
+
};
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
147
111
|
}
|
|
148
112
|
}
|
|
149
113
|
}
|
|
@@ -322,4 +286,4 @@ export default async function* build({ listDevices, port, example, listExamples,
|
|
|
322
286
|
}).listen(8080);
|
|
323
287
|
}
|
|
324
288
|
}
|
|
325
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
|
|
289
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/toolbox/build/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,57 +1,19 @@
|
|
|
1
1
|
import os from 'node:os';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { DEVICE_ALIAS } from '../prompt/devices.js';
|
|
5
|
-
import { getModdableVersion, moddableExists } from '../setup/moddable.js';
|
|
6
|
-
import { sourceEnvironment, which } from '../system/exec.js';
|
|
2
|
+
import { which } from '../system/exec.js';
|
|
3
|
+
import { getModdableVersion } from '../setup/moddable.js';
|
|
7
4
|
import { detectPython, getPythonVersion } from '../system/python.js';
|
|
8
5
|
import { unwrapOr } from '../system/errors.js';
|
|
9
|
-
function
|
|
10
|
-
return existsSync(path) && statSync(path).isDirectory();
|
|
11
|
-
}
|
|
12
|
-
function isFile(path) {
|
|
13
|
-
return existsSync(path) && statSync(path).isFile();
|
|
14
|
-
}
|
|
15
|
-
export async function gatherEnvironmentInfo(cliVersion) {
|
|
16
|
-
await sourceEnvironment();
|
|
6
|
+
export async function gatherEnvironmentInfo(cliVersion, { adapterList, ctx }) {
|
|
17
7
|
const supportedDevices = [];
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
isDir(join(process.env.ESP_BASE, 'ESP8266_RTOS_SDK')) &&
|
|
28
|
-
isDir(join(process.env.ESP_BASE, 'esp8266-2.3.0'))) {
|
|
29
|
-
supportedDevices.push('esp8266');
|
|
30
|
-
}
|
|
31
|
-
if ((process.env.PATH ?? '').includes('binaryen') &&
|
|
32
|
-
isDir(process.env.EMSDK ?? '') &&
|
|
33
|
-
isFile(process.env.EMSDK_NODE ?? '') &&
|
|
34
|
-
isFile(process.env.EMSDK_PYTHON ?? '')) {
|
|
35
|
-
supportedDevices.push('wasm');
|
|
36
|
-
}
|
|
37
|
-
if (typeof process.env.PICO_SDK_PATH === 'string' &&
|
|
38
|
-
isDir(process.env.PICO_SDK_PATH) &&
|
|
39
|
-
which('picotool') !== null &&
|
|
40
|
-
isFile(process.env.PIOASM ?? '')) {
|
|
41
|
-
supportedDevices.push('pico');
|
|
42
|
-
}
|
|
43
|
-
if (typeof process.env.NRF_ROOT === 'string' &&
|
|
44
|
-
isDir(process.env.NRF_ROOT) &&
|
|
45
|
-
((typeof process.env.NRF_SDK_DIR === 'string' &&
|
|
46
|
-
isDir(process.env.NRF_SDK_DIR)) ||
|
|
47
|
-
(typeof process.env.NRF52_SDK_PATH === 'string' &&
|
|
48
|
-
isDir(process.env.NRF52_SDK_PATH)))) {
|
|
49
|
-
supportedDevices.push('nrf52');
|
|
50
|
-
}
|
|
51
|
-
if (typeof process.env.ZEPHYR_BASE === 'string' &&
|
|
52
|
-
isDir(process.env.ZEPHYR_BASE)) {
|
|
53
|
-
supportedDevices.push('zephyr');
|
|
54
|
-
}
|
|
8
|
+
await Promise.all(adapterList
|
|
9
|
+
.filter((toolchain) => toolchain.platforms.includes(ctx.platform))
|
|
10
|
+
.map(async (toolchain) => {
|
|
11
|
+
Object.assign(process.env, toolchain.getEnvVars(ctx));
|
|
12
|
+
const result = await toolchain.verify(ctx);
|
|
13
|
+
if (result.ok) {
|
|
14
|
+
supportedDevices.push(toolchain.name);
|
|
15
|
+
}
|
|
16
|
+
}));
|
|
55
17
|
const pythonVersion = unwrapOr(await getPythonVersion(), 'Unavailable');
|
|
56
18
|
const pythonPath = which(detectPython() ?? '') ?? 'n/a';
|
|
57
19
|
const moddableVersion = unwrapOr(await getModdableVersion(), 'Not found');
|
|
@@ -70,4 +32,4 @@ export async function gatherEnvironmentInfo(cliVersion) {
|
|
|
70
32
|
supportedDevices,
|
|
71
33
|
};
|
|
72
34
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9kb2N0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFBO0FBQ3hCLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUN6RCxPQUFPLEVBQUUsWUFBWSxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDcEUsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBaUI5QyxNQUFNLENBQUMsS0FBSyxVQUFVLHFCQUFxQixDQUN6QyxVQUFrQixFQUNsQixFQUFFLFdBQVcsRUFBRSxHQUFHLEVBQWtEO0lBRXBFLE1BQU0sZ0JBQWdCLEdBQWEsRUFBRSxDQUFBO0lBRXJDLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDZixXQUFXO1NBQ1IsTUFBTSxDQUFDLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7U0FDakUsR0FBRyxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsRUFBRTtRQUN2QixNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO1FBQ3JELE1BQU0sTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUMxQyxJQUFJLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNkLGdCQUFnQixDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDdkMsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUNMLENBQUE7SUFFRCxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsTUFBTSxnQkFBZ0IsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQ3ZFLE1BQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxZQUFZLEVBQUUsSUFBSSxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUE7SUFDdkQsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLE1BQU0sa0JBQWtCLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQTtJQUN6RSxNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsSUFBSSxLQUFLLENBQUE7SUFFbEQsT0FBTztRQUNMLFVBQVU7UUFDVixNQUFNLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRTtRQUNqQixJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksRUFBRTtRQUNmLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssSUFBSSxTQUFTO1FBQ3JDLFdBQVcsRUFBRSxPQUFPLENBQUMsT0FBTztRQUM1QixRQUFRLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLGdCQUFnQjtRQUMzQyxhQUFhO1FBQ2IsVUFBVTtRQUNWLGVBQWU7UUFDZixZQUFZO1FBQ1osZ0JBQWdCO0tBQ2pCLENBQUE7QUFDSCxDQUFDIn0=
|
|
@@ -1,29 +1,14 @@
|
|
|
1
1
|
import { setTimeout as sleep } from 'node:timers/promises';
|
|
2
|
-
import { existsSync, statSync } from 'node:fs';
|
|
3
2
|
import { execSync } from 'node:child_process';
|
|
4
3
|
import { SerialPort } from 'serialport';
|
|
5
4
|
import { findBySerialNumber } from 'usb';
|
|
6
5
|
import { parseScanResult } from './parse.js';
|
|
7
|
-
import {
|
|
6
|
+
import { toolchains } from '../toolchains/registry.js';
|
|
7
|
+
import { getHostContext } from '../toolchains/context.js';
|
|
8
8
|
export default async function* scanDevices() {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
type: 'warning',
|
|
13
|
-
message: `Failed to source environment: ${envResult.error}`,
|
|
14
|
-
};
|
|
15
|
-
}
|
|
16
|
-
if (typeof process.env.IDF_PATH === 'string' &&
|
|
17
|
-
existsSync(process.env.IDF_PATH) &&
|
|
18
|
-
statSync(process.env.IDF_PATH).isDirectory()) {
|
|
19
|
-
yield { type: 'info', message: 'Found ESP_IDF, sourcing environment...' };
|
|
20
|
-
const idfResult = await sourceIdf();
|
|
21
|
-
if (!idfResult.success) {
|
|
22
|
-
yield {
|
|
23
|
-
type: 'warning',
|
|
24
|
-
message: `Failed to source IDF environment: ${idfResult.error}`,
|
|
25
|
-
};
|
|
26
|
-
}
|
|
9
|
+
const ctx = getHostContext();
|
|
10
|
+
for (const toolchain of Object.values(toolchains).filter((a) => a.platforms.includes(ctx.platform))) {
|
|
11
|
+
Object.assign(process.env, toolchain.getEnvVars(ctx));
|
|
27
12
|
}
|
|
28
13
|
const esptoolPath = (() => {
|
|
29
14
|
try {
|
|
@@ -114,4 +99,4 @@ export default async function* scanDevices() {
|
|
|
114
99
|
}
|
|
115
100
|
}
|
|
116
101
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zY2FuL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLElBQUksS0FBSyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDMUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzdDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDdkMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sS0FBSyxDQUFBO0FBRXhDLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDNUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ3RELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQTtBQUV6RCxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssU0FBUyxDQUFDLENBQUMsV0FBVztJQUN4QyxNQUFNLEdBQUcsR0FBRyxjQUFjLEVBQUUsQ0FBQTtJQUM1QixLQUFLLE1BQU0sU0FBUyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDN0QsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUNuQyxFQUFFLENBQUM7UUFDRixNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQ3ZELENBQUM7SUFFRCxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQUcsRUFBRTtRQUN4QixJQUFJLENBQUM7WUFDSCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsa0JBQWtCLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FB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
|