fix(build): make the Kotlin build work on Windows

Node cannot hand gradlew.bat to CreateProcess (EINVAL); run the wrapper
through a shell there. Two tests also assumed a POSIX checkout's
trailing newline and path separators.
This commit is contained in:
A-nony-mous committed 2026-10-24 00:22:59 +08:00
1 parent 7e448ef25a
commit ae7fdef734
3 files changed
+12 -3

No files matched your search

+10 -1
View File
@@ -33,7 +33,16 @@ async function buildKotlin(platform, configuration = 'debug') {
const wrapper = path.join(root, 'wear', process.platform === 'win32' ? 'gradlew.bat' : 'gradlew');
console.log(`[kotlin] Building ${platform} (${configuration})`);
await new Promise((resolve, reject) => {
const child = spawn(wrapper, [task, '--console=plain'], { cwd: kotlin, stdio: 'inherit' });
// A .bat cannot be exec'd directly: Node passes it to CreateProcess, which
// rejects it with EINVAL. cmd.exe has to run it, so the Windows path goes
// through a shell, quoted because the checkout may sit under a path with
// spaces in it.
const windows = process.platform === 'win32';
const child = spawn(windows ? `"${wrapper}"` : wrapper, [task, '--console=plain'], {
cwd: kotlin,
stdio: 'inherit',
shell: windows,
});
child.on('error', reject);
child.on('exit', (code, signal) => {
if (code === 0) resolve();
+1 -1
View File
@@ -7,7 +7,7 @@ const vm = require('node:vm');
// The injected shim (app/apps/evenhub/session.ts) and the published types
// (evenhub-extensions/src/index.ts) describe the same API from two sides.
const source = fs.readFileSync(path.join(__dirname, '../app/apps/evenhub/session.ts'), 'utf8');
const template = source.match(/export function buildFaceclawExtensionsScript[^`]*`([\s\S]*?)`;\n}/)[1];
const template = source.match(/export function buildFaceclawExtensionsScript[^`]*`([\s\S]*?)`;\r?\n}/)[1];
const shim = template.replace('${JSON.stringify(versionString)}', JSON.stringify('Faceclaw/9.9.9'));
const types = fs.readFileSync(path.join(__dirname, '../evenhub-extensions/src/index.ts'), 'utf8');
+1 -1
View File
@@ -28,7 +28,7 @@ test('every remaining Java source has an explicit Android boundary and every mig
const java = path.join(root, 'App_Resources/Android/src/main/java');
const list = directory => fs.readdirSync(directory, { withFileTypes: true }).flatMap(entry => {
const file = path.join(directory, entry.name);
return entry.isDirectory() ? list(file) : file.endsWith('.java') ? [path.relative(java, file)] : [];
return entry.isDirectory() ? list(file) : file.endsWith('.java') ? [path.relative(java, file).split(path.sep).join('/')] : [];
});
const boundaries = require('../native/kotlin/android-java-boundaries.json');
const retained = boundaries.flatMap(group => { assert.ok(group.reason.length > 20); return group.files; });