mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
ATOM_SHELL_INTERNAL_RUN_AS_NODE => ELECTRON_RUN_AS_NODE
This commit is contained in:
parent
d54ff3ada6
commit
5d1affed4b
|
@ -1,5 +1,5 @@
|
|||
environment:
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
|
||||
ELECTRON_RUN_AS_NODE: 1
|
||||
|
||||
install:
|
||||
- ps: Install-Product node 5.10.1 x64
|
||||
|
|
|
@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
|
|||
newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
|
||||
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
|
||||
newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
|
||||
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
|
||||
newEnv['ELECTRON_RUN_AS_NODE'] = '1';
|
||||
|
||||
return newEnv;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
|
|||
log('STDIN_PIPE_NAME: ' + stdInPipeName);
|
||||
log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
|
||||
log('STDERR_PIPE_NAME: ' + stdErrPipeName);
|
||||
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
|
||||
(function() {
|
||||
|
@ -147,7 +147,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
|
|||
delete process.env['STDIN_PIPE_NAME'];
|
||||
delete process.env['STDOUT_PIPE_NAME'];
|
||||
delete process.env['STDERR_PIPE_NAME'];
|
||||
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
delete process.env['ELECTRON_RUN_AS_NODE'];
|
||||
|
||||
require(program);
|
||||
|
||||
|
|
|
@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath(
|
|||
CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
|
||||
ELECTRON="$CONTENTS/MacOS/Electron"
|
||||
CLI="$CONTENTS/Resources/app/out/cli.js"
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
|
@ -33,5 +33,5 @@ fi
|
|||
|
||||
ELECTRON="$VSCODE_PATH/@@NAME@@"
|
||||
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
|
@ -1,6 +1,6 @@
|
|||
@echo off
|
||||
setlocal
|
||||
set VSCODE_DEV=
|
||||
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %*
|
||||
endlocal
|
|
@ -7,5 +7,5 @@ NAME="@@NAME@@"
|
|||
VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
|
||||
ELECTRON="$VSCODE_PATH/$NAME.exe"
|
||||
CLI="$VSCODE_PATH/resources/app/out/cli.js"
|
||||
ELECTRON_NO_ATTACH_CONSOLE=1 ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
ELECTRON_NO_ATTACH_CONSOLE=1 ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
|
||||
exit $?
|
||||
|
|
|
@ -26,7 +26,7 @@ function code() {
|
|||
|
||||
CLI="$ROOT/out/cli.js"
|
||||
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
|
||||
ELECTRON_RUN_AS_NODE=1 \
|
||||
NODE_ENV=development \
|
||||
VSCODE_DEV=1 \
|
||||
ELECTRON_ENABLE_LOGGING=1 \
|
||||
|
|
|
@ -4,7 +4,7 @@ setlocal
|
|||
rem APPVEYOR Builds
|
||||
if not "%APPVEYOR%" == "" (
|
||||
set ELECTRON_NO_ATTACH_CONSOLE=1
|
||||
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=
|
||||
set ELECTRON_RUN_AS_NODE=
|
||||
)
|
||||
|
||||
:: Integration Tests
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
@echo off
|
||||
setlocal
|
||||
|
||||
set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
|
||||
set ELECTRON_RUN_AS_NODE=1
|
||||
|
||||
rem TFS Builds
|
||||
if not "%BUILD_BUILDID%" == "" (
|
||||
|
|
|
@ -21,11 +21,11 @@ test -d out || ./node_modules/.bin/gulp compile
|
|||
|
||||
# Unit Tests
|
||||
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 \
|
||||
node_modules/mocha/bin/_mocha $*
|
||||
else
|
||||
cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
|
||||
cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
|
||||
./.build/electron/electron \
|
||||
node_modules/mocha/bin/_mocha $*
|
||||
fi
|
||||
|
|
|
@ -49,7 +49,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
|
|||
newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
|
||||
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
|
||||
newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
|
||||
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
|
||||
newEnv['ELECTRON_RUN_AS_NODE'] = '1';
|
||||
|
||||
return newEnv;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
|
|||
log('STDIN_PIPE_NAME: ' + stdInPipeName);
|
||||
log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
|
||||
log('STDERR_PIPE_NAME: ' + stdErrPipeName);
|
||||
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
|
||||
(function() {
|
||||
|
@ -149,7 +149,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
|
|||
delete process.env['STDIN_PIPE_NAME'];
|
||||
delete process.env['STDOUT_PIPE_NAME'];
|
||||
delete process.env['STDERR_PIPE_NAME'];
|
||||
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
delete process.env['ELECTRON_RUN_AS_NODE'];
|
||||
|
||||
require(program);
|
||||
|
||||
|
|
|
@ -285,11 +285,11 @@ interface IEnv {
|
|||
|
||||
function getUnixUserEnvironment(): TPromise<IEnv> {
|
||||
const promise = new TPromise((c, e) => {
|
||||
const runAsNode = process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
const runAsNode = process.env['ELECTRON_RUN_AS_NODE'];
|
||||
const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE'];
|
||||
|
||||
const env = assign({}, process.env, {
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1',
|
||||
ELECTRON_RUN_AS_NODE: '1',
|
||||
ELECTRON_NO_ATTACH_CONSOLE: '1'
|
||||
});
|
||||
|
||||
|
@ -321,9 +321,9 @@ function getUnixUserEnvironment(): TPromise<IEnv> {
|
|||
const env = JSON.parse(raw);
|
||||
|
||||
if (runAsNode) {
|
||||
env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = runAsNode;
|
||||
env['ELECTRON_RUN_AS_NODE'] = runAsNode;
|
||||
} else {
|
||||
delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
delete env['ELECTRON_RUN_AS_NODE'];
|
||||
}
|
||||
|
||||
if (noAttach) {
|
||||
|
|
|
@ -33,7 +33,7 @@ export function main(args: string[]): TPromise<void> {
|
|||
'VSCODE_CLI': '1',
|
||||
'ELECTRON_NO_ATTACH_CONSOLE': '1'
|
||||
});
|
||||
delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
|
||||
delete env['ELECTRON_RUN_AS_NODE'];
|
||||
|
||||
let options = {
|
||||
detached: true,
|
||||
|
|
|
@ -586,7 +586,7 @@ export class DebugService implements debug.IDebugService {
|
|||
timeout: 1000 * 60 * 5,
|
||||
args: [`${ publisher }.${ type }`, JSON.stringify(data), aiKey],
|
||||
env: {
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
|
||||
ELECTRON_RUN_AS_NODE: 1,
|
||||
PIPE_LOGGING: 'true',
|
||||
AMD_ENTRYPOINT: 'vs/workbench/parts/debug/node/telemetryApp'
|
||||
}
|
||||
|
|
|
@ -183,7 +183,7 @@ export class ElectronGitService extends GitService {
|
|||
timeout: 1000 * 60,
|
||||
args: [path, workspaceRoot, encoding, remote.process.execPath, version],
|
||||
env: {
|
||||
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
|
||||
ELECTRON_RUN_AS_NODE: 1,
|
||||
PIPE_LOGGING: 'true',
|
||||
AMD_ENTRYPOINT: 'vs/workbench/parts/git/node/gitApp',
|
||||
VERBOSE_LOGGING: String(!contextService.getConfiguration().env.isBuilt || contextService.getConfiguration().env.verboseLogging)
|
||||
|
|
|
@ -63,7 +63,7 @@ function getArgs() {
|
|||
|
||||
function cleanEnv() {
|
||||
var keys = [
|
||||
'ATOM_SHELL_INTERNAL_RUN_AS_NODE',
|
||||
'ELECTRON_RUN_AS_NODE',
|
||||
'PTYCWD',
|
||||
'PTYPID',
|
||||
'PTYSHELL'
|
||||
|
|
Loading…
Reference in a new issue