From bbc1950d345effdf5f7424d48479200b63a94c48 Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Thu, 19 May 2016 13:45:20 -0700
Subject: [PATCH] Disable integrated terminal to unblock Windows build

---
 build/gulpfile.vscode.js           | 11 ++---------
 npm-shrinkwrap.json                | 10 ----------
 package.json                       |  2 --
 src/vs/workbench/buildfile.js      |  4 ++--
 src/vs/workbench/workbench.main.js |  2 +-
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index f6a259c18a2..b2f66950d07 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -32,17 +32,10 @@ var baseModules = [
 	'applicationinsights', 'assert', 'child_process', 'chokidar', 'crypto', 'emmet',
 	'events', 'fs', 'getmac', 'glob', 'graceful-fs', 'http', 'http-proxy-agent',
 	'https', 'https-proxy-agent', 'iconv-lite', 'electron', 'net',
-	'os', 'path', 'pty.js', 'readline', 'sax', 'semver', 'stream', 'string_decoder', 'url', 'term.js',
+	'os', 'path', /*'pty.js',*/ 'readline', 'sax', 'semver', 'stream', 'string_decoder', 'url', /*'term.js',*/
 	'vscode-textmate', 'winreg', 'yauzl', 'native-keymap', 'zlib', 'minimist'
 ];
 
-// Until code signing issue with pty.js pre-built binaries is sorted out, just remove it from the
-// build on Windows.
-if (process.platform === 'win32') {
-	baseModules.splice(baseModules.indexOf('pty.js'), 1);
-	baseModules.splice(baseModules.indexOf('term.js'), 1);
-}
-
 // Build
 
 var vscodeEntryPoints = _.flatten([
@@ -75,7 +68,7 @@ var vscodeResources = [
 	'out-build/vs/workbench/parts/html/browser/webview.html',
 	'out-build/vs/workbench/parts/markdown/**/*.md',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
-	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
+	//'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
 	'!**/test/**'
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a252e748184..73aeae4a6eb 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -340,11 +340,6 @@
       "from": "preserve@>=0.2.0 <0.3.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
     },
-    "pty.js": {
-      "version": "0.3.0",
-      "from": "https://github.com/platformio/pty.js/tarball/22e84bd6ef177c7c211a767564ffe64426cb8a69",
-      "resolved": "https://github.com/platformio/pty.js/tarball/22e84bd6ef177c7c211a767564ffe64426cb8a69"
-    },
     "randomatic": {
       "version": "1.1.5",
       "from": "randomatic@>=1.1.3 <2.0.0",
@@ -395,11 +390,6 @@
       "from": "string_decoder@>=0.10.0 <0.11.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
     },
-    "term.js": {
-      "version": "0.0.7",
-      "from": "https://github.com/jeremyramin/term.js/tarball/master",
-      "resolved": "https://github.com/jeremyramin/term.js/tarball/master"
-    },
     "typechecker": {
       "version": "2.0.8",
       "from": "typechecker@>=2.0.1 <2.1.0",
diff --git a/package.json b/package.json
index 97158298980..4066a293192 100644
--- a/package.json
+++ b/package.json
@@ -27,10 +27,8 @@
     "iconv-lite": "0.4.13",
     "minimist": "^1.2.0",
     "native-keymap": "0.1.2",
-    "pty.js": "https://github.com/platformio/pty.js/tarball/22e84bd6ef177c7c211a767564ffe64426cb8a69",
     "sax": "1.1.2",
     "semver": "4.3.6",
-    "term.js": "https://github.com/jeremyramin/term.js/tarball/master",
     "vscode-debugprotocol": "1.8.0",
     "vscode-textmate": "1.0.11",
     "winreg": "1.2.0",
diff --git a/src/vs/workbench/buildfile.js b/src/vs/workbench/buildfile.js
index 1c8bc0f1989..7998d738bd6 100644
--- a/src/vs/workbench/buildfile.js
+++ b/src/vs/workbench/buildfile.js
@@ -42,9 +42,9 @@ exports.collectModules = function(excludes) {
 		createModuleDescription('vs/workbench/node/extensionHostProcess', []),
 	];
 
-	if (process.platform !== 'win32') {
+	/*if (process.platform !== 'win32') {
 		modules.push(createModuleDescription('vs/workbench/parts/terminal/electron-browser/terminalPanel', excludes));
-	}
+	}*/
 
 	return modules;
 };
\ No newline at end of file
diff --git a/src/vs/workbench/workbench.main.js b/src/vs/workbench/workbench.main.js
index 45bbb116fc7..b4eade10d9b 100644
--- a/src/vs/workbench/workbench.main.js
+++ b/src/vs/workbench/workbench.main.js
@@ -58,7 +58,7 @@ define([
 
 	'vs/workbench/parts/output/browser/output.contribution',
 
-	'vs/workbench/parts/terminal/electron-browser/terminal.contribution',
+	//'vs/workbench/parts/terminal/electron-browser/terminal.contribution',
 
 	'vs/workbench/parts/markdown/browser/markdown.contribution',
 	'vs/workbench/parts/markdown/browser/markdownActions.contribution',
-- 
GitLab