Skip to content

Commit b69e40d

Browse files
committed
Use license in product.json for rpm
Fixes microsoft#17133
1 parent 20a2252 commit b69e40d

4 files changed

Lines changed: 4 additions & 2 deletions

File tree

build/gulpfile.vscode.linux.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ function prepareRpmPackage(arch) {
116116
.pipe(replace('@@VERSION@@', packageJson.version))
117117
.pipe(replace('@@RELEASE@@', linuxPackageRevision))
118118
.pipe(replace('@@ARCHITECTURE@@', rpmArch))
119+
.pipe(replace('@@LICENSE@@', product.licenseName))
119120
.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
120121
.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
121122
.pipe(replace('@@DEPENDENCIES@@', rpmDependencies[rpmArch].join(', ')))

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "code-oss-dev",
33
"version": "1.9.0",
44
"electronVersion": "1.4.6",
5-
"distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
5+
"distro": "2eecc8b68318fba1fc5b62930287914ac9225e8a",
66
"author": {
77
"name": "Microsoft Corporation"
88
},

product.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"applicationName": "code-oss",
55
"dataFolderName": ".vscode-oss",
66
"win32MutexName": "vscodeoss",
7+
"licenseName": "MIT",
78
"licenseUrl": "https://github.com/Microsoft/vscode/blob/master/LICENSE.txt",
89
"win32DirName": "Microsoft Code OSS",
910
"win32NameVersion": "Microsoft Code OSS",

resources/linux/rpm/code.spec.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Summary: Code editing. Redefined.
55
Group: Development/Tools
66
Vendor: Microsoft Corporation
77
Packager: Visual Studio Code Team <vscode-linux@microsoft.com>
8-
License: Multiple, see https://code.visualstudio.com/license
8+
License: @@LICENSE@@
99
URL: https://code.visualstudio.com/
1010
Icon: @@NAME@@.xpm
1111
Requires: @@DEPENDENCIES@@

0 commit comments

Comments
 (0)