microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-05 20:08:58 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

move inno_updater into app when building setup

Browse Source
This commit is contained in:
Joao Moreno
2018-01-22 10:47:00 +01:00
parent 45bb5bf3be
commit 19bab787f4
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/gulpfile.vscode.js
View File

@@ -349,8 +349,6 @@ function packageTask(platform, arch, opts) {
result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
result = es.merge(result, gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' }));
} else if (platform === 'linux') {
result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
.pipe(replace('@@NAME@@', product.applicationName))

16
build/gulpfile.vscode.win32.js
View File

@@ -9,10 +9,12 @@ const gulp = require('gulp');
const path = require('path');
const assert = require('assert');
const cp = require('child_process');
const es = require('event-stream');
const _7z = require('7zip')['7z'];
const util = require('./lib/util');
const pkg = require('../package.json');
const product = require('../product.json');
const vfs = require('vinyl-fs');
const repoPath = path.dirname(__dirname);
const buildPath = arch => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
@@ -38,8 +40,8 @@ function packageInnoSetup(iss, options, cb) {
.on('exit', () => cb(null));
}
function buildWin32Setup(arch) {
return cb => {
function _buildWin32Setup(arch) {
return es.through(null, function () {
const ia32AppId = product.win32AppId;
const x64AppId = product.win32x64AppId;
@@ -65,7 +67,15 @@ function buildWin32Setup(arch) {
OutputDir: setupDir(arch)
};
packageInnoSetup(issPath, { definitions }, cb);
packageInnoSetup(issPath, { definitions }, err => err ? this.emit('error', err) : this.emit('end'));
});
}
function buildWin32Setup(arch) {
return () => {
return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
.pipe(vfs.dest(buildPath))
.pipe(_buildWin32Setup(arch));
};
}