提交 bbc1950d 编写于 作者: D Daniel Imms

Disable integrated terminal to unblock Windows build

上级 e32913ce
......@@ -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/**'
......
......@@ -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",
......
......@@ -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
......@@ -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',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册