提交 4821ad5f 编写于 作者: J Joao Moreno

use ELECTRON_RUN_AS_NODE

上级 c0b72c16
environment: environment:
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1 ELECTRON_RUN_AS_NODE: 1
install: install:
- ps: Install-Product node 4.1.1 x64 - ps: Install-Product node 4.1.1 x64
......
...@@ -47,7 +47,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string ...@@ -47,7 +47,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
newEnv['STDIN_PIPE_NAME'] = stdInPipeName; newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName; newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1'; newEnv['ELECTRON_RUN_AS_NODE'] = '1';
return newEnv; return newEnv;
} }
......
...@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME']; ...@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDIN_PIPE_NAME: ' + stdInPipeName);
log('STDOUT_PIPE_NAME: ' + stdOutPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']); log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
// stdout redirection to named pipe // stdout redirection to named pipe
(function() { (function() {
...@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A ...@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
// Unset the custom environmental variables that should not get inherited // Unset the custom environmental variables that should not get inherited
delete process.env['STDIN_PIPE_NAME']; delete process.env['STDIN_PIPE_NAME'];
delete process.env['STDOUT_PIPE_NAME']; delete process.env['STDOUT_PIPE_NAME'];
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; delete process.env['ELECTRON_RUN_AS_NODE'];
require(program); require(program);
......
...@@ -15,6 +15,6 @@ fi ...@@ -15,6 +15,6 @@ fi
VSCODE_LAUNCHER="$VSCODE_DIR/resources/app/out/cli.js" VSCODE_LAUNCHER="$VSCODE_DIR/resources/app/out/cli.js"
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \ ELECTRON_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \
"$VSCODE_DIR/$ELECTRON_FILE" $VSCODE_LAUNCHER "$@" "$VSCODE_DIR/$ELECTRON_FILE" $VSCODE_LAUNCHER "$@"
exit $? exit $?
@echo off @echo off
setlocal setlocal
set VSCODE_DEV= set VSCODE_DEV=
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 set ELECTRON_RUN_AS_NODE=1
"%~dp0..\\Code.exe" "%~dp0code.js" %* "%~dp0..\\Code.exe" "%~dp0code.js" %*
endlocal endlocal
\ No newline at end of file
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; delete process.env['ELECTRON_RUN_AS_NODE'];
require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' }); require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' });
process.exit(0); process.exit(0);
\ No newline at end of file
@echo off @echo off
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 set ELECTRON_RUN_AS_NODE=1
pushd %~dp0\.. pushd %~dp0\..
.\.build\electron\electron.exe .\node_modules\mocha\bin\_mocha %* .\.build\electron\electron.exe .\node_modules\mocha\bin\_mocha %*
......
...@@ -10,11 +10,11 @@ fi ...@@ -10,11 +10,11 @@ fi
# Unit Tests # Unit Tests
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \ cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
./.build/electron/Electron.app/Contents/MacOS/Electron \ ./.build/electron/Electron.app/Contents/MacOS/Electron \
node_modules/mocha/bin/_mocha $* node_modules/mocha/bin/_mocha $*
else else
cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \ cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
./.build/electron/electron \ ./.build/electron/electron \
node_modules/mocha/bin/_mocha $* node_modules/mocha/bin/_mocha $*
fi fi
......
...@@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string ...@@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
newEnv['STDIN_PIPE_NAME'] = stdInPipeName; newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName; newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1'; newEnv['ELECTRON_RUN_AS_NODE'] = '1';
return newEnv; return newEnv;
} }
......
...@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME']; ...@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDIN_PIPE_NAME: ' + stdInPipeName);
log('STDOUT_PIPE_NAME: ' + stdOutPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']); log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
// stdout redirection to named pipe // stdout redirection to named pipe
(function() { (function() {
...@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A ...@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
// Unset the custom environmental variables that should not get inherited // Unset the custom environmental variables that should not get inherited
delete process.env['STDIN_PIPE_NAME']; delete process.env['STDIN_PIPE_NAME'];
delete process.env['STDOUT_PIPE_NAME']; delete process.env['STDOUT_PIPE_NAME'];
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; delete process.env['ELECTRON_RUN_AS_NODE'];
require(program); require(program);
......
...@@ -45,7 +45,7 @@ export function main(argv: string[]) { ...@@ -45,7 +45,7 @@ export function main(argv: string[]) {
} else if (argParser.hasFlag('version', 'v')) { } else if (argParser.hasFlag('version', 'v')) {
console.log(packageJson.version); console.log(packageJson.version);
} else { } else {
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; delete process.env['ELECTRON_RUN_AS_NODE'];
spawn(process.env['VSCODE_PATH'], process.argv.slice(2), { detached: true, stdio: 'ignore' }); spawn(process.env['VSCODE_PATH'], process.argv.slice(2), { detached: true, stdio: 'ignore' });
} }
......
...@@ -117,7 +117,7 @@ export function createNativeRawGitService(workspaceRoot: string, gitPath: string ...@@ -117,7 +117,7 @@ export function createNativeRawGitService(workspaceRoot: string, gitPath: string
timeout: 1000 * 60, timeout: 1000 * 60,
args: [gitPath, workspaceRoot, defaultEncoding, remote.process.execPath], args: [gitPath, workspaceRoot, defaultEncoding, remote.process.execPath],
env: { env: {
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1, ELECTRON_RUN_AS_NODE: 1,
AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp' AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp'
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册