Home Explore Help
Sign In
mirrors
/
vscodium
mirror of https://github.com/VSCodium/vscodium
2
0
Fork 0
Files Issues 0 Wiki
Tree: b90af6eda5
Branches Tags
vscodium
/
patches
/
build-version.patch

build-version.patch 7.4 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133 
  1. diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
    2. 

  2. index a07c552..e5546e0 100644
    3. 

  3. --- a/build/gulpfile.reh.js
    4. 

  4. +++ b/build/gulpfile.reh.js
    5. 

  5. @@ -250,4 +250,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
    6. 

  6.  		const name = product.nameShort;
    7. 

  7. +		const release = packageJson.release;
    8. 

  8.  		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
    9. 

  9. -			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
    10. 

  10. +			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
    11. 

  11.  
    12. 

  12. diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
    13. 

  13. index 2c075a3..ff98402 100644
    14. 

  14. --- a/build/gulpfile.vscode.js
    15. 

  15. +++ b/build/gulpfile.vscode.js
    16. 

  16. @@ -191,3 +191,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    17. 

  17.  
    18. 

  18. -		let version = packageJson.version;
    19. 

  19. +		let version = packageJson.version
    20. 

  20.  		const quality = product.quality;
    21. 

  21. @@ -199,3 +199,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    22. 

  22.  		const name = product.nameShort;
    23. 

  23. -		const packageJsonUpdates = { name, version };
    24. 

  24. +		const release = packageJson.release;
    25. 

  25. +		const packageJsonUpdates = { name, version, release };
    26. 

  26.  
    27. 

  27. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
    28. 

  28. index 4a25ca5..ca33d2e 100644
    29. 

  29. --- a/build/gulpfile.vscode.linux.js
    30. 

  30. +++ b/build/gulpfile.vscode.linux.js
    31. 

  31. @@ -24,4 +24,2 @@ const commit = util.getVersion(root);
    32. 

  32.  
    33. 

  33. -const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
    34. 

  34. -
    35. 

  35.  /**
    36. 

  36. @@ -87,3 +85,3 @@ function prepareDebPackage(arch) {
    37. 

  37.  					.pipe(replace('@@NAME@@', product.applicationName))
    38. 

  38. -					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
    39. 

  39. +					.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
    40. 

  40.  					.pipe(replace('@@ARCHITECTURE@@', debArch))
    41. 

  41. @@ -192,4 +190,3 @@ function prepareRpmPackage(arch) {
    42. 

  42.  			.pipe(replace('@@ICON@@', product.linuxIconName))
    43. 

  43. -			.pipe(replace('@@VERSION@@', packageJson.version))
    44. 

  44. -			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
    45. 

  45. +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
    46. 

  46.  			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
    47. 

  47. @@ -266,3 +263,3 @@ function prepareSnapPackage(arch) {
    48. 

  48.  			.pipe(replace('@@NAME@@', product.applicationName))
    49. 

  49. -			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
    50. 

  50. +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
    51. 

  51.  			// Possible run-on values https://snapcraft.io/docs/architectures
    52. 

  52. diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
    53. 

  53. index 81ba509..43f5377 100644
    54. 

  54. --- a/build/gulpfile.vscode.win32.js
    55. 

  55. +++ b/build/gulpfile.vscode.win32.js
    56. 

  56. @@ -93,4 +93,4 @@ function buildWin32Setup(arch, target) {
    57. 

  57.  			DirName: product.win32DirName,
    58. 

  58. -			Version: pkg.version,
    59. 

  59. -			RawVersion: pkg.version.replace(/-\w+$/, ''),
    60. 

  60. +			Version: `${pkg.version}.${pkg.release}`,
    61. 

  61. +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
    62. 

  62.  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
    63. 

  63. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
    64. 

  64. index 61659d2..5cafa06 100644
    65. 

  65. --- a/resources/linux/rpm/code.spec.template
    66. 

  66. +++ b/resources/linux/rpm/code.spec.template
    67. 

  67. @@ -2,3 +2,3 @@ Name:     @@NAME@@
    68. 

  68.  Version:  @@VERSION@@
    69. 

  69. -Release:  @@RELEASE@@.el7
    70. 

  70. +Release:  el7
    71. 

  71.  Summary:  Code editing. Redefined.
    72. 

  72. diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
    73. 

  73. index 1ae8079..0dad6ac 100644
    74. 

  74. --- a/src/vs/base/common/product.ts
    75. 

  75. +++ b/src/vs/base/common/product.ts
    76. 

  76. @@ -34,2 +34,3 @@ export interface IProductConfiguration {
    77. 

  77.  	readonly version: string;
    78. 

  78. +	readonly release: string;
    79. 

  79.  	readonly date?: string;
    80. 

  80. diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
    81. 

  81. index e1c60a3..a12d52c 100644
    82. 

  82. --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
    83. 

  83. +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
    84. 

  84. @@ -239,3 +239,3 @@ export class DiagnosticsService implements IDiagnosticsService {
    85. 

  85.  		const output: string[] = [];
    86. 

  86. -		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
    87. 

  87. +		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
    88. 

  88.  		output.push(`OS Version:       ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
    89. 

  89. diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
    90. 

  90. index 7e63a16..74d1f26 100644
    91. 

  91. --- a/src/vs/platform/product/common/product.ts
    92. 

  92. +++ b/src/vs/platform/product/common/product.ts
    93. 

  93. @@ -34,3 +34,3 @@ else if (typeof require?.__$__nodeRequire === 'function') {
    94. 

  94.  	product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
    95. 

  95. -	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string };
    96. 

  96. +	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string, release: string };
    97. 

  97.  
    98. 

  98. @@ -47,3 +47,4 @@ else if (typeof require?.__$__nodeRequire === 'function') {
    99. 

  99.  	Object.assign(product, {
    100. 

  100. -		version: pkg.version
    101. 

  101. +		version: pkg.version,
    102. 

  102. +		release: pkg.release
    103. 

  103.  	});
    104. 

  104. diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    105. 

  105. index ec4ff95..36e882f 100644
    106. 

  106. --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    107. 

  107. +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    108. 

  108. @@ -146,4 +146,5 @@ export class BrowserDialogHandler implements IDialogHandler {
    109. 

  109.  			return localize('aboutDetail',
    110. 

  110. -				"Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
    111. 

  111. +				"Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nBrowser: {4}",
    112. 

  112.  				this.productService.version || 'Unknown',
    113. 

  113. +				this.productService.release || 'Unknown',
    114. 

  114.  				this.productService.commit || 'Unknown',
    115. 

  115. diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
    116. 

  116. index dc7430b..23def01 100644
    117. 

  117. --- a/src/vs/workbench/contrib/issue/browser/issueService.ts
    118. 

  118. +++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
    119. 

  119. @@ -67,2 +67,3 @@ export class WebIssueService implements IWorkbenchIssueService {
    120. 

  120.  Version: ${this.productService.version}
    121. 

  121. +Release: ${this.productService.release ?? 'unknown'}
    122. 

  122.  Commit: ${this.productService.commit ?? 'unknown'}
    123. 

  123. diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    124. 

  124. index f63b75f..8e24c02 100644
    125. 

  125. --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    126. 

  126. +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    127. 

  127. @@ -169,4 +169,5 @@ export class NativeDialogHandler implements IDialogHandler {
    128. 

  128.  			return localize({ key: 'aboutDetail', comment: ['Electron, Chromium, Node.js and V8 are product names that need no translation'] },
    129. 

  129. -				"Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nChromium: {4}\nNode.js: {5}\nV8: {6}\nOS: {7}\nSandboxed: {8}",
    130. 

  130. +				"Version: {0}\nRelease: {1}\nCommit: {2}\nDate: {3}\nElectron: {4}\nChromium: {5}\nNode.js: {6}\nV8: {7}\nOS: {8}\nSandboxed: {9}",
    131. 

  131.  				version,
    132. 

  132. +				this.productService.release || 'Unknown',
    133. 

  133.  				this.productService.commit || 'Unknown',
    134.