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

move back to ATOM_SHELL_INTERNAL_RUN_AS_NODE

Browse source
This commit is contained in:
Joao Moreno 2016-02-15 11:07:01 +01:00
parent de60490b30
commit d46c0646f2
13 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -1,5 +1,5 @@
environment: environment:
ELECTRON_RUN_AS_NODE: 1 ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
install: install:
- ps: Install-Product node 4.1.1 x64 - ps: Install-Product node 4.1.1 x64

2
extensions/typescript/src/utils/electron.ts
View file

@ -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['ELECTRON_RUN_AS_NODE'] = '1'; newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
return newEnv; return newEnv;
} }

4
extensions/typescript/src/utils/electronForkStart.ts
View file

@ -29,7 +29,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('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 // stdout redirection to named pipe
(function() { (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 // 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['ELECTRON_RUN_AS_NODE']; delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
require(program); require(program);

2
resources/darwin/bin/code.sh
View file

@ -7,5 +7,5 @@ function realpath() { python -c "import os,sys; print os.path.realpath(sys.argv[
CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")" CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
ELECTRON="$CONTENTS/MacOS/Electron" ELECTRON="$CONTENTS/MacOS/Electron"
CLI="$CONTENTS/Resources/app/out/cli.js" CLI="$CONTENTS/Resources/app/out/cli.js"
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
exit $? exit $?

2
resources/linux/bin/code.sh
View file

@ -7,5 +7,5 @@ NAME="@@NAME@@"
VSCODE_PATH="/usr/share/$NAME" VSCODE_PATH="/usr/share/$NAME"
ELECTRON="$VSCODE_PATH/$NAME" ELECTRON="$VSCODE_PATH/$NAME"
CLI="$VSCODE_PATH/resources/app/out/cli.js" 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 $? exit $?

2
resources/win32/bin/code.cmd
View file

@ -1,6 +1,6 @@
@echo off @echo off
setlocal setlocal
set VSCODE_DEV= set VSCODE_DEV=
set ELECTRON_RUN_AS_NODE=1 set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
"%~dp0..\\Code.exe" "%~dp0code.js" %* "%~dp0..\\Code.exe" "%~dp0code.js" %*
endlocal endlocal

2
resources/win32/bin/code.js
View file

@ -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' }); require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' });
process.exit(0); process.exit(0);

2
scripts/test.bat
View file

@ -1,6 +1,6 @@
@echo off @echo off
set ELECTRON_RUN_AS_NODE=1 set ATOM_SHELL_INTERNAL_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 %*

4
scripts/test.sh
View file

@ -10,11 +10,11 @@ fi
# Unit Tests # Unit Tests
if [[ "$OSTYPE" == "darwin"* ]]; then 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 \ ./.build/electron/Electron.app/Contents/MacOS/Electron \
node_modules/mocha/bin/_mocha $* node_modules/mocha/bin/_mocha $*
else else
cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \ cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
./.build/electron/electron \ ./.build/electron/electron \
node_modules/mocha/bin/_mocha $* node_modules/mocha/bin/_mocha $*
fi fi

2
src/vs/base/node/stdFork.ts
View file

@ -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['ELECTRON_RUN_AS_NODE'] = '1'; newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
return newEnv; return newEnv;
} }

4
src/vs/base/node/stdForkStart.js
View file

@ -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('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 // stdout redirection to named pipe
(function() { (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 // 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['ELECTRON_RUN_AS_NODE']; delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
require(program); require(program);

2
src/vs/workbench/electron-main/cli.ts
View file

@ -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['ELECTRON_RUN_AS_NODE']; delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
spawn(process.execPath, process.argv.slice(2), { detached: true, stdio: 'ignore' }); spawn(process.execPath, process.argv.slice(2), { detached: true, stdio: 'ignore' });
} }

2
src/vs/workbench/parts/git/electron-browser/electronGitService.ts
View file

@ -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: {
ELECTRON_RUN_AS_NODE: 1, ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp' AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp'
} }
} }