From 4846088f22202df577c6b84b5c29745abefff730 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Mon, 22 Jan 2018 15:47:18 +0100
Subject: [PATCH] fix inno updater

---
 build/gulpfile.vscode.win32.js | 25 +++++++++++++------------
 build/tfs/win32/1_build.ps1    |  4 ++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index a7ecdf66f5a..15459f7dae8 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -9,7 +9,6 @@ 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');
@@ -40,8 +39,8 @@ function packageInnoSetup(iss, options, cb) {
 		.on('exit', () => cb(null));
 }
 
-function _buildWin32Setup(arch) {
-	return es.through(null, function () {
+function buildWin32Setup(arch) {
+	return cb => {
 		const ia32AppId = product.win32AppId;
 		const x64AppId = product.win32x64AppId;
 
@@ -67,15 +66,7 @@ function _buildWin32Setup(arch) {
 			OutputDir: setupDir(arch)
 		};
 
-		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(arch)))
-			.pipe(_buildWin32Setup(arch));
+		packageInnoSetup(issPath, { definitions }, cb);
 	};
 }
 
@@ -100,3 +91,13 @@ gulp.task('vscode-win32-ia32-archive', ['clean-vscode-win32-ia32-archive'], arch
 
 gulp.task('clean-vscode-win32-x64-archive', util.rimraf(zipDir('x64')));
 gulp.task('vscode-win32-x64-archive', ['clean-vscode-win32-x64-archive'], archiveWin32Setup('x64'));
+
+function copyInnoUpdater(arch) {
+	return () => {
+		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
+			.pipe(vfs.dest(buildPath(arch)));
+	};
+}
+
+gulp.task('vscode-win32-ia32-copy-inno-updater', copyInnoUpdater('ia32'));
+gulp.task('vscode-win32-x64-copy-inno-updater', copyInnoUpdater('x64'));
\ No newline at end of file
diff --git a/build/tfs/win32/1_build.ps1 b/build/tfs/win32/1_build.ps1
index bc6ade13de3..0fcb56c1b9e 100644
--- a/build/tfs/win32/1_build.ps1
+++ b/build/tfs/win32/1_build.ps1
@@ -45,6 +45,10 @@ step "Build minified" {
   exec { & npm run gulp -- "vscode-win32-$global:arch-min" }
 }
 
+step "Copy Inno updater" {
+  exec { & npm run gulp -- "vscode-win32-$global:arch-copy-inno-updater" }
+}
+
 # step "Create loader snapshot" {
 #   exec { & 	node build\lib\snapshotLoader.js --arch=$global:arch }
 # }
-- 
GitLab