Domovská stránka Prehľadávať Pomoc
Prihlásiť sa
mirrors
/
vscodium
zrkadlo https://github.com/VSCodium/vscodium
2
0
Fork 0
Súbory Issues 0 Wiki
Strom: 9f21a39e6f
Branche Tagy
vscodium
/
patches
/
build-version.patch

build-version.patch 11 KB
História Raw

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

  2. index 2abc3f3..a3cbf2d 100644
    3. 

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

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

  5. @@ -246,8 +246,9 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
    6. 

  6.  		}
    7. 

  7.  
    8. 

  8.  		const name = product.nameShort;
    9. 

  9. +		const release = packageJson.release;
    10. 

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

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

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

  13.  
    14. 

  14.  		const date = new Date().toISOString();
    15. 

  15.  
    16. 

  16. diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
    17. 

  17. index 28f8e52..f17962d 100644
    18. 

  18. --- a/build/gulpfile.vscode.js
    19. 

  19. +++ b/build/gulpfile.vscode.js
    20. 

  20. @@ -187,7 +187,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    21. 

  21.  		const sources = es.merge(src, extensions)
    22. 

  22.  			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
    23. 

  23.  
    24. 

  24. -		let version = packageJson.version;
    25. 

  25. +		let version = packageJson.version
    26. 

  26.  		const quality = product.quality;
    27. 

  27.  
    28. 

  28.  		if (quality && quality !== 'stable') {
    29. 

  29. @@ -195,7 +195,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
    30. 

  30.  		}
    31. 

  31.  
    32. 

  32.  		const name = product.nameShort;
    33. 

  33. -		const packageJsonUpdates = { name, version };
    34. 

  34. +		const release = packageJson.release;
    35. 

  35. +		const packageJsonUpdates = { name, version, release };
    36. 

  36.  
    37. 

  37.  		// for linux url handling
    38. 

  38.  		if (platform === 'linux') {
    39. 

  39. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
    40. 

  40. index 489d9cc..e9f00f3 100644
    41. 

  41. --- a/build/gulpfile.vscode.linux.js
    42. 

  42. +++ b/build/gulpfile.vscode.linux.js
    43. 

  43. @@ -83,7 +83,7 @@ function prepareDebPackage(arch) {
    44. 

  44.  				const dependencies = debianDependenciesGenerator.getDependencies(binaryDir, product.applicationName, debArch, sysroot);
    45. 

  45.  				gulp.src('resources/linux/debian/control.template', { base: '.' })
    46. 

  46.  					.pipe(replace('@@NAME@@', product.applicationName))
    47. 

  47. -					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
    48. 

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

  49.  					.pipe(replace('@@ARCHITECTURE@@', debArch))
    50. 

  50.  					.pipe(replace('@@DEPENDS@@', dependencies.join(', ')))
    51. 

  51.  					.pipe(replace('@@RECOMMENDS@@', debianRecommendedDependencies.join(', ')))
    52. 

  52. @@ -188,8 +188,7 @@ function prepareRpmPackage(arch) {
    53. 

  53.  			.pipe(replace('@@NAME@@', product.applicationName))
    54. 

  54.  			.pipe(replace('@@NAME_LONG@@', product.nameLong))
    55. 

  55.  			.pipe(replace('@@ICON@@', product.linuxIconName))
    56. 

  56. -			.pipe(replace('@@VERSION@@', packageJson.version))
    57. 

  57. -			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
    58. 

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

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

  60.  			.pipe(replace('@@LICENSE@@', product.licenseName))
    61. 

  61.  			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
    62. 

  62. @@ -262,7 +261,7 @@ function prepareSnapPackage(arch) {
    63. 

  63.  
    64. 

  64.  		const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
    65. 

  65.  			.pipe(replace('@@NAME@@', product.applicationName))
    66. 

  66. -			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
    67. 

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

  68.  			// Possible run-on values https://snapcraft.io/docs/architectures
    69. 

  69.  			.pipe(replace('@@ARCHITECTURE@@', arch === 'x64' ? 'amd64' : arch))
    70. 

  70.  			.pipe(rename('snap/snapcraft.yaml'));
    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. @@ -91,8 +91,8 @@ function buildWin32Setup(arch, target) {
    76. 

  76.  			NameLong: product.nameLong,
    77. 

  77.  			NameShort: product.nameShort,
    78. 

  78.  			DirName: product.win32DirName,
    79. 

  79. -			Version: pkg.version,
    80. 

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

  81. +			Version: `${pkg.version}.${pkg.release}`,
    82. 

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

  83.  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
    84. 

  84.  			ExeBasename: product.nameShort,
    85. 

  85.  			RegValueName: product.win32RegValueName,
    86. 

  86. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
    87. 

  87. index 00ddb6f..814c964 100644
    88. 

  88. --- a/resources/linux/rpm/code.spec.template
    89. 

  89. +++ b/resources/linux/rpm/code.spec.template
    90. 

  90. @@ -1,6 +1,6 @@
    91. 

  91.  Name:     @@NAME@@
    92. 

  92.  Version:  @@VERSION@@
    93. 

  93. -Release:  @@RELEASE@@.el7
    94. 

  94. +Release:  el7
    95. 

  95.  Summary:  Code editing. Redefined.
    96. 

  96.  Group:    Development/Tools
    97. 

  97.  Vendor:   Microsoft Corporation
    98. 

  98. diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
    99. 

  99. index 1ae8079..0dad6ac 100644
    100. 

  100. --- a/src/vs/base/common/product.ts
    101. 

  101. +++ b/src/vs/base/common/product.ts
    102. 

  102. @@ -32,6 +32,7 @@ export type ExtensionVirtualWorkspaceSupport = {
    103. 

  103.  
    104. 

  104.  export interface IProductConfiguration {
    105. 

  105.  	readonly version: string;
    106. 

  106. +	readonly release: string;
    107. 

  107.  	readonly date?: string;
    108. 

  108.  	readonly quality?: string;
    109. 

  109.  	readonly commit?: string;
    110. 

  110. diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
    111. 

  111. index 046cb39..3271b6c 100644
    112. 

  112. --- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
    113. 

  113. +++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
    114. 

  114. @@ -75,7 +75,7 @@ export class IssueReporter extends Disposable {
    115. 

  115.  		this.issueReporterModel = new IssueReporterModel({
    116. 

  116.  			issueType: configuration.data.issueType || IssueType.Bug,
    117. 

  117.  			versionInfo: {
    118. 

  118. -				vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
    119. 

  119. +				vscodeVersion: `${configuration.product.nameShort} ${!!configuration.product.darwinUniversalAssetId ? `${configuration.product.version} (Universal)` : configuration.product.version} ${configuration.product.release || 'Release unknown'} (${configuration.product.commit || 'Commit unknown'}, ${configuration.product.date || 'Date unknown'})`,
    120. 

  120.  				os: `${this.configuration.os.type} ${this.configuration.os.arch} ${this.configuration.os.release}${isLinuxSnap ? ' snap' : ''}`
    121. 

  121.  			},
    122. 

  122.  			extensionsDisabled: !!configuration.disableExtensions,
    123. 

  123. diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
    124. 

  124. index b0cc736..035c5cb 100644
    125. 

  125. --- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
    126. 

  126. +++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
    127. 

  127. @@ -74,7 +74,7 @@ Type: <b>${this.getIssueTypeTitle()}</b>
    128. 

  128.  
    129. 

  129.  ${this._data.issueDescription}
    130. 

  130.  ${this.getExtensionVersion()}
    131. 

  131. -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
    132. 

  132. +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
    133. 

  133.  OS version: ${this._data.versionInfo && this._data.versionInfo.os}
    134. 

  134.  Modes:${modes.length ? ' ' + modes.join(', ') : ''}
    135. 

  135.  ${this.getRemoteOSes()}
    136. 

  136. diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
    137. 

  137. index e1c60a3..a12d52c 100644
    138. 

  138. --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
    139. 

  139. +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
    140. 

  140. @@ -237,7 +237,7 @@ export class DiagnosticsService implements IDiagnosticsService {
    141. 

  141.  
    142. 

  142.  	private formatEnvironment(info: IMainProcessInfo): string {
    143. 

  143.  		const output: string[] = [];
    144. 

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

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

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

  147.  		const cpus = osLib.cpus();
    148. 

  148.  		if (cpus && cpus.length > 0) {
    149. 

  149. diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
    150. 

  150. index 7e63a16..74d1f26 100644
    151. 

  151. --- a/src/vs/platform/product/common/product.ts
    152. 

  152. +++ b/src/vs/platform/product/common/product.ts
    153. 

  153. @@ -32,7 +32,7 @@ else if (typeof require?.__$__nodeRequire === 'function') {
    154. 

  154.  	const rootPath = dirname(FileAccess.asFileUri('', require));
    155. 

  155.  
    156. 

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

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

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

  159.  
    160. 

  160.  	// Running out of sources
    161. 

  161.  	if (env['VSCODE_DEV']) {
    162. 

  162. @@ -45,7 +45,8 @@ else if (typeof require?.__$__nodeRequire === 'function') {
    163. 

  163.  	}
    164. 

  164.  
    165. 

  165.  	Object.assign(product, {
    166. 

  166. -		version: pkg.version
    167. 

  167. +		version: pkg.version,
    168. 

  168. +		release: pkg.release
    169. 

  169.  	});
    170. 

  170.  }
    171. 

  171.  
    172. 

  172. diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    173. 

  173. index ec4ff95..f721052 100644
    174. 

  174. --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    175. 

  175. +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
    176. 

  176. @@ -144,7 +144,8 @@ export class BrowserDialogHandler implements IDialogHandler {
    177. 

  177.  	async about(): Promise<void> {
    178. 

  178.  		const detailString = (useAgo: boolean): string => {
    179. 

  179.  			return localize('aboutDetail',
    180. 

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

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

  182. +				this.productService.release || 'Unknown',
    183. 

  183.  				this.productService.version || 'Unknown',
    184. 

  184.  				this.productService.commit || 'Unknown',
    185. 

  185.  				this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
    186. 

  186. diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
    187. 

  187. index dc7430b..23def01 100644
    188. 

  188. --- a/src/vs/workbench/contrib/issue/browser/issueService.ts
    189. 

  189. +++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
    190. 

  190. @@ -65,6 +65,7 @@ export class WebIssueService implements IWorkbenchIssueService {
    191. 

  191.  		return `ADD ISSUE DESCRIPTION HERE
    192. 

  192.  
    193. 

  193.  Version: ${this.productService.version}
    194. 

  194. +Release: ${this.productService.release ?? 'unknown'}
    195. 

  195.  Commit: ${this.productService.commit ?? 'unknown'}
    196. 

  196.  User Agent: ${userAgent ?? 'unknown'}
    197. 

  197.  Embedder: ${this.productService.embedderIdentifier ?? 'unknown'}
    198. 

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

  199. index a4728e7..d1a8b94 100644
    200. 

  200. --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    201. 

  201. +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
    202. 

  202. @@ -167,8 +167,9 @@ export class NativeDialogHandler implements IDialogHandler {
    203. 

  203.  
    204. 

  204.  		const detailString = (useAgo: boolean): string => {
    205. 

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

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

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

  208.  				version,
    209. 

  209. +				this.productService.release || 'Unknown',
    210. 

  210.  				this.productService.commit || 'Unknown',
    211. 

  211.  				this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',
    212. 

  212.  				process.versions['electron'],
    213.