maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Disable integrated terminal to unblock Windows build"

Browse source 
This reverts commit bbc1950d34.
This commit is contained in:
Daniel Imms 2016-05-20 12:31:28 -07:00
parent 11dde1e887
commit ca7937b279
5 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/gulpfile.vscode.js
View file

@ -32,10 +32,17 @@ 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([
@ -68,7 +75,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/**'

10
npm-shrinkwrap.json generated
View file

@ -340,6 +340,11 @@
"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",
@ -390,6 +395,11 @@
"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",

2
package.json
View file

@ -27,8 +27,10 @@
"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",

4
src/vs/workbench/buildfile.js
View file

@ -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;
};

2
src/vs/workbench/workbench.main.js
View 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',