mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 13:29:44 +00:00
move back to ATOM_SHELL_INTERNAL_RUN_AS_NODE
This commit is contained in:
parent
de60490b30
commit
d46c0646f2
|
@ -1,5 +1,5 @@
|
|||
environment:
|
||||
ELECTRON_RUN_AS_NODE: 1
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
|
||||
|
||||
install:
|
||||
- ps: Install-Product node 4.1.1 x64
|
||||
|
|
|
@ -47,7 +47,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
|
|||
|
||||
newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
|
||||
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
|
||||
newEnv['ELECTRON_RUN_AS_NODE'] = '1';
|
||||
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
|
||||
|
||||
return newEnv;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
|
|||
|
||||
log('STDIN_PIPE_NAME: ' + stdInPipeName);
|
||||
log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
|
||||
log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
|
||||
log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
|
||||
|
||||
// stdout redirection to named pipe
|
||||
(function() {
|
||||
|
@ -134,7 +134,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
|
|||
// Unset the custom environmental variables that should not get inherited
|
||||
delete process.env['STDIN_PIPE_NAME'];
|
||||
delete process.env['STDOUT_PIPE_NAME'];
|
||||
delete process.env['ELECTRON_RUN_AS_NODE'];
|
||||
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
|
||||
require(program);
|
||||
|
||||
|
|
|
@ -7,5 +7,5 @@ function realpath() { python -c "import os,sys; print os.path.realpath(sys.argv[
|
|||
CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
|
||||
ELECTRON="$CONTENTS/MacOS/Electron"
|
||||
CLI="$CONTENTS/Resources/app/out/cli.js"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
|
@ -7,5 +7,5 @@ NAME="@@NAME@@"
|
|||
VSCODE_PATH="/usr/share/$NAME"
|
||||
ELECTRON="$VSCODE_PATH/$NAME"
|
||||
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
@echo off
|
||||
setlocal
|
||||
set VSCODE_DEV=
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
|
||||
"%~dp0..\\Code.exe" "%~dp0code.js" %*
|
||||
endlocal
|
|
@ -1,3 +1,3 @@
|
|||
delete process.env['ELECTRON_RUN_AS_NODE'];
|
||||
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' });
|
||||
process.exit(0);
|
|
@ -1,6 +1,6 @@
|
|||
@echo off
|
||||
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
|
||||
|
||||
pushd %~dp0\..
|
||||
.\.build\electron\electron.exe .\node_modules\mocha\bin\_mocha %*
|
||||
|
|
|
@ -10,11 +10,11 @@ fi
|
|||
|
||||
# Unit Tests
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
|
||||
cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
|
||||
./.build/electron/Electron.app/Contents/MacOS/Electron \
|
||||
node_modules/mocha/bin/_mocha $*
|
||||
else
|
||||
cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
|
||||
cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
|
||||
./.build/electron/electron \
|
||||
node_modules/mocha/bin/_mocha $*
|
||||
fi
|
||||
|
|
|
@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
|
|||
|
||||
newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
|
||||
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
|
||||
newEnv['ELECTRON_RUN_AS_NODE'] = '1';
|
||||
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
|
||||
|
||||
return newEnv;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
|
|||
|
||||
log('STDIN_PIPE_NAME: ' + stdInPipeName);
|
||||
log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
|
||||
log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
|
||||
log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
|
||||
|
||||
// stdout redirection to named pipe
|
||||
(function() {
|
||||
|
@ -136,7 +136,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
|
|||
// Unset the custom environmental variables that should not get inherited
|
||||
delete process.env['STDIN_PIPE_NAME'];
|
||||
delete process.env['STDOUT_PIPE_NAME'];
|
||||
delete process.env['ELECTRON_RUN_AS_NODE'];
|
||||
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
|
||||
require(program);
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ export function main(argv: string[]) {
|
|||
} else if (argParser.hasFlag('version', 'v')) {
|
||||
console.log(packageJson.version);
|
||||
} else {
|
||||
delete process.env['ELECTRON_RUN_AS_NODE'];
|
||||
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
spawn(process.execPath, process.argv.slice(2), { detached: true, stdio: 'ignore' });
|
||||
}
|
||||
|
||||
|
|
|
@ -117,7 +117,7 @@ export function createNativeRawGitService(workspaceRoot: string, gitPath: string
|
|||
timeout: 1000 * 60,
|
||||
args: [gitPath, workspaceRoot, defaultEncoding, remote.process.execPath],
|
||||
env: {
|
||||
ELECTRON_RUN_AS_NODE: 1,
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
|
||||
AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp'
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue