timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-23 11:30:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(1.79): updates patches

Browse Source
This commit is contained in:
Baptiste Augrain
2023-05-28 23:07:30 +02:00
parent 272f67d95b
commit dc1e3961c3
10 changed files with 98 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/build-version.patch
View File

@@ -1,21 +1,21 @@
diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 2e8ef58..6870416 100644
index 2a0c236..9fea722 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -251,4 +251,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
@@ -250,4 +250,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
const name = product.nameShort;
+ const release = packageJson.release;
const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
- .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
+ .pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
@@ -257,3 +258,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
@@ -256,3 +257,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
const productJsonStream = gulp.src(['product.json'], { base: '.' })
- .pipe(json({ commit, date, version }));
+ .pipe(json({ commit, date, version, release }));
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 3d3eee9..964dd18 100644
index 0ca2cfd..3fb21d5 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -225,3 +225,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
@@ -60,7 +60,7 @@ index 90f75cc..275c958 100644
+ .pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
// Possible run-on values https://snapcraft.io/docs/architectures
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 0d3abda..2606af5 100644
index 6e9a6f3..9d80b6b 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -94,4 +94,4 @@ function buildWin32Setup(arch, target) {
@@ -80,7 +80,7 @@ index 06b8549..3af1f45 100644
+Release: el7
Summary: Code editing. Redefined.
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
index 2526747..73c6b7f 100644
index ac9cd5d..87b6105 100644
--- a/src/vs/base/common/product.ts
+++ b/src/vs/base/common/product.ts
@@ -58,2 +58,3 @@ export interface IProductConfiguration {
@@ -111,7 +111,7 @@ index 51a55e1..26dfe7b 100644
+ release: pkg.release
});
diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
index 1dbc24a..8385b70 100644
index 4b320bb..6619c75 100644
--- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
@@ -22,2 +22,3 @@ import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaul
@@ -149,7 +149,7 @@ index 0000000..2a8ea57
+ return LABELS[language] ?? DEFAULT_LABEL;
+}
diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
index dd166f1..f0a52c4 100644
index 575bde3..f427833 100644
--- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
+++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
@@ -14,2 +14,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
@@ -160,8 +160,8 @@ index dd166f1..f0a52c4 100644
const osProps = await this.nativeHostService.getOSProperties();
+ const releaseString = getReleaseString();
@@ -90,3 +92,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
process.sandboxed ? 'Yes' : 'No' // TODO@bpasero remove me once sandbox is final
@@ -89,3 +91,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
`${osProps.type} ${osProps.arch} ${osProps.release}${isLinuxSnap ? ' snap' : ''}`
- );
+ ).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
};