Revert "Add separate icons for non-stable builds (#8078)" (#8222)

This reverts commit 9eb438bb24.
This commit is contained in:
Karl Burtram
2019-11-05 11:22:36 -08:00
committed by GitHub
parent e49ff93122
commit 5a392dfd58
26 changed files with 11 additions and 38 deletions

View File

@@ -6,7 +6,6 @@
'use strict';
const gulp = require('gulp');
const rename = require('gulp-rename'); // {{SQL CARBON EDIT}}
const path = require('path');
const fs = require('fs');
const assert = require('assert');
@@ -43,11 +42,6 @@ function packageInnoSetup(iss, options, cb) {
definitions['Sign'] = 'true';
}
// {{SQL CARBON EDIT}} Switch file icon for non-stable builds
if (product.quality !== 'stable') {
gulp.src('resources/win32/code_file-insiders.ico').pipe(rename('resources/win32/code_file.ico')).pipe(gulp.dest('resources/win32'));
}
const keys = Object.keys(definitions);
keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
@@ -83,15 +77,6 @@ function buildWin32Setup(arch, target) {
productJson['target'] = target;
fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
// // {{SQL CARBON EDIT}} Modify installer file based on quality
if(product.quality !== 'stable') {
fs.writeFileSync(issPath,
fs.readFileSync(issPath).toString()
.replace(/inno-(small|big)-([\d]*)/g, 'inno-$1-$2-insiders')
.replace(/code.ico/g, 'code-insiders.ico'));
}
const definitions = {
NameLong: product.nameLong,
NameShort: product.nameShort,
@@ -153,7 +138,7 @@ function copyInnoUpdater(arch) {
function updateIcon(executablePath) {
return cb => {
const icon = product.quality === 'stable' ? path.join(repoPath, 'resources', 'win32', 'code-insiders.ico') : path.join(repoPath, 'resources', 'win32', 'code.ico'); // {{SQL CARBON EDIT}} Use separate icons for non-stable
const icon = path.join(repoPath, 'resources', 'win32', 'code.ico');
rcedit(executablePath, { icon }, cb);
};
}