From b17312f534c9ba58133f100c28ebb71b7973e6b9 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Fri, 26 Feb 2021 22:14:40 +0100 Subject: [PATCH 1/3] patch static binary name --- patches/binary-name.patch | 48 +++++++++++++++++++++++++++++++++++++++ prepare_vscode.sh | 1 + 2 files changed, 49 insertions(+) create mode 100644 patches/binary-name.patch diff --git a/patches/binary-name.patch b/patches/binary-name.patch new file mode 100644 index 0000000..b09070b --- /dev/null +++ b/patches/binary-name.patch @@ -0,0 +1,48 @@ +diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js +index 6d3a369..57009d4 100644 +--- a/build/gulpfile.vscode.js ++++ b/build/gulpfile.vscode.js +@@ -276,7 +276,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op + all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); + } else if (platform === 'darwin') { + const shortcut = gulp.src('resources/darwin/bin/code.sh') +- .pipe(rename('bin/code')); ++ .pipe(rename('bin/' + product.applicationName)); + + all = es.merge(all, shortcut); + } +@@ -483,7 +483,7 @@ const generateVSCodeConfigurationTask = task.define('generate-vscode-configurati + const arch = process.env['VSCODE_ARCH']; + const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`); + const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app'; +- const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', 'code'); ++ const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', product.applicationName); + const codeProc = cp.exec( + `${appPath} --export-default-configuration='${allConfigDetailsPath}' --wait --user-data-dir='${userDataDir}' --extensions-dir='${extensionsDir}'`, + (err, stdout, stderr) => { +diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts +index 50c4460..bf73260 100644 +--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts ++++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts +@@ -430,7 +430,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain + + // macOS + if (this.environmentService.isBuilt) { +- return join(this.environmentService.appRoot, 'bin', 'code'); ++ return join(this.environmentService.appRoot, 'bin', `${product.applicationName}`); + } + + return join(this.environmentService.appRoot, 'scripts', 'code-cli.sh'); +diff --git a/src/vs/workbench/contrib/cli/node/cli.contribution.ts b/src/vs/workbench/contrib/cli/node/cli.contribution.ts +index 30972a4..0a9435c 100644 +--- a/src/vs/workbench/contrib/cli/node/cli.contribution.ts ++++ b/src/vs/workbench/contrib/cli/node/cli.contribution.ts +@@ -29,7 +29,7 @@ let _source: string | null = null; + function getSource(): string { + if (!_source) { + const root = FileAccess.asFileUri('', require).fsPath; +- _source = path.resolve(root, '..', 'bin', 'code'); ++ _source = path.resolve(root, '..', 'bin', product.applicationName); + } + return _source; + } diff --git a/prepare_vscode.sh b/prepare_vscode.sh index 12fdb42..1993f06 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -10,6 +10,7 @@ cd vscode || exit # apply patches patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch patch -u resources/linux/rpm/code.spec.template -i ../patches/no-replace-product-json.patch +git apply ../patches/binary-name.patch if [[ "$OS_NAME" == "osx" ]]; then CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional From 3a15ad9778191f5d29dd8ff8c8f0645bf2a36372 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Thu, 11 Mar 2021 02:13:52 +0100 Subject: [PATCH 2/3] fixing for 1.54 --- patches/binary-name.patch | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/patches/binary-name.patch b/patches/binary-name.patch index b09070b..44db574 100644 --- a/patches/binary-name.patch +++ b/patches/binary-name.patch @@ -24,15 +24,12 @@ diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src index 50c4460..bf73260 100644 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts -@@ -430,7 +430,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain - +@@ -431,4 +431,4 @@ export class NativeHostMainService extends Disposable implements INativeHostMain // macOS - if (this.environmentService.isBuilt) { -- return join(this.environmentService.appRoot, 'bin', 'code'); -+ return join(this.environmentService.appRoot, 'bin', `${product.applicationName}`); + if (this.environmentMainService.isBuilt) { +- return join(this.environmentMainService.appRoot, 'bin', 'code'); ++ return join(this.environmentMainService.appRoot, 'bin', `${product.applicationName}`); } - - return join(this.environmentService.appRoot, 'scripts', 'code-cli.sh'); diff --git a/src/vs/workbench/contrib/cli/node/cli.contribution.ts b/src/vs/workbench/contrib/cli/node/cli.contribution.ts index 30972a4..0a9435c 100644 --- a/src/vs/workbench/contrib/cli/node/cli.contribution.ts From b99e93970efb391e07f427e448819626f3eebbfc Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Thu, 11 Mar 2021 04:11:59 +0100 Subject: [PATCH 3/3] fixing windows --- build/build_windows.ps1 | 3 +-- prepare_vscode.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/build_windows.ps1 b/build/build_windows.ps1 index f051bf1..c0a80e7 100755 --- a/build/build_windows.ps1 +++ b/build/build_windows.ps1 @@ -1,9 +1,8 @@ -# powershell -ExecutionPolicy ByPass -File build_windows.ps1 +# powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1 $env:Path += ";C:\Program Files\Git\bin" Remove-Item -Recurse -Force VSCode* -Remove-Item -Recurse -Force vscode bash ./get_repo.sh diff --git a/prepare_vscode.sh b/prepare_vscode.sh index 891904a..3cf0024 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -10,7 +10,7 @@ cd vscode || exit # apply patches patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch patch -u resources/linux/rpm/code.spec.template -i ../patches/fix-rpm-spec.patch -git apply ../patches/binary-name.patch +git apply --ignore-whitespace ../patches/binary-name.patch if [[ "$OS_NAME" == "osx" ]]; then CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional