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

build-version.patch 8.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151 
  1. diff --git a/.vscode/settings.json b/.vscode/settings.json
    2. 

  2. index 184042b..a067194 100644
    3. 

  3. --- a/.vscode/settings.json
    4. 

  4. +++ b/.vscode/settings.json
    5. 

  5. @@ -87,3 +87,3 @@
    6. 

  6.  		"editor.defaultFormatter": "vscode.typescript-language-features",
    7. 

  7. -		"editor.formatOnSave": true
    8. 

  8. +		// "editor.formatOnSave": true
    9. 

  9.  	},
    10. 

  10. diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
    11. 

  11. index 980f647..959fb88 100644
    12. 

  12. --- a/build/gulpfile.reh.js
    13. 

  13. +++ b/build/gulpfile.reh.js
    14. 

  14. @@ -245,4 +245,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
    15. 

  15.  		const name = product.nameShort;
    16. 

  16. +		const release = packageJson.release;
    17. 

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

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

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

  20.  
    21. 

  21. @@ -251,3 +252,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
    22. 

  22.  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
    23. 

  23. -			.pipe(json({ commit, date, version }));
    24. 

  24. +			.pipe(json({ commit, date, version, release }));
    25. 

  25.  
    26. 

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

  27. index 6947d1e..80f358e 100644
    28. 

  28. --- a/build/gulpfile.vscode.js
    29. 

  29. +++ b/build/gulpfile.vscode.js
    30. 

  30. @@ -224,3 +224,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    31. 

  31.  
    32. 

  32. -		let version = packageJson.version;
    33. 

  33. +		let version = packageJson.version
    34. 

  34.  		const quality = product.quality;
    35. 

  35. @@ -232,3 +232,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    36. 

  36.  		const name = product.nameShort;
    37. 

  37. -		const packageJsonUpdates = { name, version };
    38. 

  38. +		const release = packageJson.release;
    39. 

  39. +		const packageJsonUpdates = { name, version, release };
    40. 

  40.  
    41. 

  41. @@ -243,3 +244,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    42. 

  42.  		const date = new Date().toISOString();
    43. 

  43. -		const productJsonUpdate = { commit, date, checksums, version };
    44. 

  44. +		const productJsonUpdate = { commit, date, checksums, version, release };
    45. 

  45.  
    46. 

  46. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
    47. 

  47. index 4a25ca5..ca33d2e 100644
    48. 

  48. --- a/build/gulpfile.vscode.linux.js
    49. 

  49. +++ b/build/gulpfile.vscode.linux.js
    50. 

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

  51.  
    52. 

  52. -const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
    53. 

  53. -
    54. 

  54.  /**
    55. 

  55. @@ -87,3 +85,3 @@ function prepareDebPackage(arch) {
    56. 

  56.  					.pipe(replace('@@NAME@@', product.applicationName))
    57. 

  57. -					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
    58. 

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

  59.  					.pipe(replace('@@ARCHITECTURE@@', debArch))
    60. 

  60. @@ -192,4 +190,3 @@ function prepareRpmPackage(arch) {
    61. 

  61.  			.pipe(replace('@@ICON@@', product.linuxIconName))
    62. 

  62. -			.pipe(replace('@@VERSION@@', packageJson.version))
    63. 

  63. -			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
    64. 

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

  65.  			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
    66. 

  66. @@ -266,3 +263,3 @@ function prepareSnapPackage(arch) {
    67. 

  67.  			.pipe(replace('@@NAME@@', product.applicationName))
    68. 

  68. -			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
    69. 

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

  70.  			// Possible run-on values https://snapcraft.io/docs/architectures
    71. 

  71. diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
    72. 

  72. index 81ba509..43f5377 100644
    73. 

  73. --- a/build/gulpfile.vscode.win32.js
    74. 

  74. +++ b/build/gulpfile.vscode.win32.js
    75. 

  75. @@ -93,4 +93,4 @@ function buildWin32Setup(arch, target) {
    76. 

  76.  			DirName: product.win32DirName,
    77. 

  77. -			Version: pkg.version,
    78. 

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

  79. +			Version: `${pkg.version}.${pkg.release}`,
    80. 

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

  81.  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
    82. 

  82. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
    83. 

  83. index 61659d2..5cafa06 100644
    84. 

  84. --- a/resources/linux/rpm/code.spec.template
    85. 

  85. +++ b/resources/linux/rpm/code.spec.template
    86. 

  86. @@ -2,3 +2,3 @@ Name:     @@NAME@@
    87. 

  87.  Version:  @@VERSION@@
    88. 

  88. -Release:  @@RELEASE@@.el7
    89. 

  89. +Release:  el7
    90. 

  90.  Summary:  Code editing. Redefined.
    91. 

  91. diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
    92. 

  92. index e07695c..55ccc32 100644
    93. 

  93. --- a/src/vs/base/common/product.ts
    94. 

  94. +++ b/src/vs/base/common/product.ts
    95. 

  95. @@ -34,2 +34,3 @@ export interface IProductConfiguration {
    96. 

  96.  	readonly version: string;
    97. 

  97. +	readonly release: string;
    98. 

  98.  	readonly date?: string;
    99. 

  99. diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
    100. 

  100. index 66e35c8..087c055 100644
    101. 

  101. --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
    102. 

  102. +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
    103. 

  103. @@ -238,3 +238,3 @@ export class DiagnosticsService implements IDiagnosticsService {
    104. 

  104.  		const output: string[] = [];
    105. 

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

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

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

  108. diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
    109. 

  109. index bceda01..4fe44e2 100644
    110. 

  110. --- a/src/vs/platform/product/common/product.ts
    111. 

  111. +++ b/src/vs/platform/product/common/product.ts
    112. 

  112. @@ -49,6 +49,7 @@ else if (typeof require?.__$__nodeRequire === 'function') {
    113. 

  113.  	if (!product.version) {
    114. 

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

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

  116.  
    117. 

  117.  		Object.assign(product, {
    118. 

  118. -			version: pkg.version
    119. 

  119. +			version: pkg.version,
    120. 

  120. +			release: pkg.release
    121. 

  121.  		});
    122. 

  122. diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    123. 

  123. index ec4ff95..36e882f 100644
    124. 

  124. --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    125. 

  125. +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    126. 

  126. @@ -146,4 +146,5 @@ export class BrowserDialogHandler implements IDialogHandler {
    127. 

  127.  			return localize('aboutDetail',
    128. 

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

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

  130.  				this.productService.version || 'Unknown',
    131. 

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

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

  133. diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
    134. 

  134. index dc7430b..23def01 100644
    135. 

  135. --- a/src/vs/workbench/contrib/issue/browser/issueService.ts
    136. 

  136. +++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
    137. 

  137. @@ -67,2 +67,3 @@ export class WebIssueService implements IWorkbenchIssueService {
    138. 

  138.  Version: ${this.productService.version}
    139. 

  139. +Release: ${this.productService.release ?? 'unknown'}
    140. 

  140.  Commit: ${this.productService.commit ?? 'unknown'}
    141. 

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

  142. index f63b75f..8e24c02 100644
    143. 

  143. --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    144. 

  144. +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    145. 

  145. @@ -169,4 +169,5 @@ export class NativeDialogHandler implements IDialogHandler {
    146. 

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

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

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

  149.  				version,
    150. 

  150. +				this.productService.release || 'Unknown',
    151. 

  151.  				this.productService.commit || 'Unknown',
    152.