From 0fb99b704c5ade8514a2bf3c1953f82a29eb1535 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 29 Mar 2017 10:47:51 +0200
Subject: [PATCH] :green_heart: hopefully fix the linux tfs build

---
 build/gulpfile.vscode.linux.js | 14 +++++++-------
 build/lib/optimize.js          |  6 +-----
 build/lib/optimize.ts          |  6 +-----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index 95b46b0ab9d..a1f07c8146f 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -63,10 +63,10 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@LICENSE@@', product.licenseName))
 			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
 
-		const icon = gulp.src('resources/linux/code.png', { base: '.' })
+		const icon = gulp.src('resources/linux/code.png', { base: '.', buffer: false })
 			.pipe(rename('usr/share/pixmaps/' + product.applicationName + '.png'));
 
-		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
+		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir, buffer: false })
 			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
 
 		let size = 0;
@@ -111,7 +111,7 @@ function buildDebPackage(arch) {
 		'mkdir -p deb',
 		'fakeroot dpkg-deb -b ' + product.applicationName + '-' + debArch + ' deb',
 		'dpkg-scanpackages deb /dev/null > Packages'
-	], { cwd: '.build/linux/deb/' + debArch});
+	], { cwd: '.build/linux/deb/' + debArch });
 }
 
 function getRpmBuildPath(rpmArch) {
@@ -139,7 +139,7 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@LICENSE@@', product.licenseName))
 			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
 
-		const icon = gulp.src('resources/linux/code.png', { base: '.' })
+		const icon = gulp.src('resources/linux/code.png', { base: '.', buffer: false })
 			.pipe(rename('BUILD/usr/share/pixmaps/' + product.applicationName + '.png'));
 
 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
@@ -212,13 +212,13 @@ function prepareFlatpak(arch) {
 			.pipe(replace('@@LICENSE@@', product.licenseName))
 			.pipe(rename('share/appdata/' + flatpakManifest.appId + '.appdata.xml')));
 
-		all.push(gulp.src(binaryDir + '/**/*', { base:binaryDir })
+		all.push(gulp.src(binaryDir + '/**/*', { base: binaryDir, buffer: false })
 			.pipe(rename(function (p) {
 				p.dirname = 'share/' + product.applicationName + '/' + p.dirname;
 			})));
 
 		return es.merge(all).pipe(vfs.dest(destination));
-	}
+	};
 }
 
 function buildFlatpak(arch) {
@@ -249,7 +249,7 @@ function buildFlatpak(arch) {
 	}
 	return function (cb) {
 		require('flatpak-bundler').bundle(manifest, buildOptions, cb);
-	}
+	};
 }
 
 gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/deb/i386'));
diff --git a/build/lib/optimize.js b/build/lib/optimize.js
index 217fe0e3b3f..15798b7a36a 100644
--- a/build/lib/optimize.js
+++ b/build/lib/optimize.js
@@ -203,11 +203,7 @@ function uglifyWithCopyrights() {
     var output = input
         .pipe(flatmap(function (stream, f) {
         return stream.pipe(uglify({
-            preserveComments: preserveComments(f),
-            output: {
-                // linux tfs build agent is crashing, does this help?§
-                max_line_len: 3200000
-            }
+            preserveComments: preserveComments(f)
         }));
     }));
     return es.duplex(input, output);
diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
index 9dbaead5f79..f08e42f31a7 100644
--- a/build/lib/optimize.ts
+++ b/build/lib/optimize.ts
@@ -275,11 +275,7 @@ function uglifyWithCopyrights(): NodeJS.ReadWriteStream {
 	const output = input
 		.pipe(flatmap((stream, f) => {
 			return stream.pipe(uglify({
-				preserveComments: preserveComments(<FileWithCopyright>f),
-				output: {
-					// linux tfs build agent is crashing, does this help?§
-					max_line_len: 3200000
-				}
+				preserveComments: preserveComments(<FileWithCopyright>f)
 			}));
 		}));