mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-26 13:19:42 +00:00
* chore: update electron@30.0.9 * chore: update rpm deps * chore: bump electron@30.1.2 * fix: update kerberos for Node.js 20.x Refsc1f7acafb2* fix: use shell when spawning .bat or .cmd files Refs https://github.com/nodejs/node/commit/6627222409 * fix: update @vscode/test-electron@2.4.0 Refs3f7a3cc5c5* fixup! use shell when spawning .bat or .cmd files * chore: bump nodejs@20.14.0 internal build * ci: skip nodejsMirror for 20.14.0 due to missing builds * fixup! use shell when spawning .bat or .cmd files * chore: update debian deps * fixup! skip nodejsMirror for 20.14.0 due to missing builds * fix: universal build - Updates vscode-universal-bundler to support x64ArchFiles option - Kerberos starts building universal binaries which should now be skipped from lipo step via x64ArchFiles - Skips bundling *.mk files * chore: bump distro
72 lines
2.4 KiB
TypeScript
72 lines
2.4 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
import * as path from 'path';
|
|
import * as fs from 'fs';
|
|
import * as minimatch from 'minimatch';
|
|
import { makeUniversalApp } from 'vscode-universal-bundler';
|
|
import { spawn } from '@malept/cross-spawn-promise';
|
|
|
|
const root = path.dirname(path.dirname(__dirname));
|
|
|
|
async function main(buildDir?: string) {
|
|
const arch = process.env['VSCODE_ARCH'];
|
|
|
|
if (!buildDir) {
|
|
throw new Error('Build dir not provided');
|
|
}
|
|
|
|
const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
|
|
const appName = product.nameLong + '.app';
|
|
const x64AppPath = path.join(buildDir, 'VSCode-darwin-x64', appName);
|
|
const arm64AppPath = path.join(buildDir, 'VSCode-darwin-arm64', appName);
|
|
const asarRelativePath = path.join('Contents', 'Resources', 'app', 'node_modules.asar');
|
|
const outAppPath = path.join(buildDir, `VSCode-darwin-${arch}`, appName);
|
|
const productJsonPath = path.resolve(outAppPath, 'Contents', 'Resources', 'app', 'product.json');
|
|
|
|
const filesToSkip = [
|
|
'**/CodeResources',
|
|
'**/Credits.rtf',
|
|
];
|
|
|
|
await makeUniversalApp({
|
|
x64AppPath,
|
|
arm64AppPath,
|
|
asarPath: asarRelativePath,
|
|
outAppPath,
|
|
force: true,
|
|
mergeASARs: true,
|
|
x64ArchFiles: '*/kerberos.node',
|
|
filesToSkipComparison: (file: string) => {
|
|
for (const expected of filesToSkip) {
|
|
if (minimatch(file, expected)) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
});
|
|
|
|
const productJson = JSON.parse(fs.readFileSync(productJsonPath, 'utf8'));
|
|
Object.assign(productJson, {
|
|
darwinUniversalAssetId: 'darwin-universal'
|
|
});
|
|
fs.writeFileSync(productJsonPath, JSON.stringify(productJson, null, '\t'));
|
|
|
|
// Verify if native module architecture is correct
|
|
const findOutput = await spawn('find', [outAppPath, '-name', 'kerberos.node']);
|
|
const lipoOutput = await spawn('lipo', ['-archs', findOutput.replace(/\n$/, '')]);
|
|
if (lipoOutput.replace(/\n$/, '') !== 'x86_64 arm64') {
|
|
throw new Error(`Invalid arch, got : ${lipoOutput}`);
|
|
}
|
|
}
|
|
|
|
if (require.main === module) {
|
|
main(process.argv[2]).catch(err => {
|
|
console.error(err);
|
|
process.exit(1);
|
|
});
|
|
}
|