提交 05254667 编写于 作者: B Benjamin Pasero

back to ATOM_SHELL_INTERNAL_RUN_AS_NODE

上级 5aa8cf26
environment: environment:
ELECTRON_RUN_AS_NODE: 1 ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
install: install:
- ps: Install-Product node 5.10.1 x64 - ps: Install-Product node 5.10.1 x64
......
...@@ -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['STDERR_PIPE_NAME'] = stdErrPipeName; newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
newEnv['ELECTRON_RUN_AS_NODE'] = '1'; newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
return newEnv; return newEnv;
} }
......
...@@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME']; ...@@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDIN_PIPE_NAME: ' + stdInPipeName);
log('STDOUT_PIPE_NAME: ' + stdOutPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
log('STDERR_PIPE_NAME: ' + stdErrPipeName); log('STDERR_PIPE_NAME: ' + stdErrPipeName);
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() {
...@@ -147,7 +147,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); ...@@ -147,7 +147,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
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['STDERR_PIPE_NAME']; delete process.env['STDERR_PIPE_NAME'];
delete process.env['ELECTRON_RUN_AS_NODE']; delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
require(program); require(program);
......
...@@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath( ...@@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath(
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 $?
\ No newline at end of file
...@@ -33,5 +33,5 @@ fi ...@@ -33,5 +33,5 @@ fi
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 $?
\ No newline at end of file
@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
call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %* call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %*
endlocal endlocal
\ No newline at end of file
...@@ -7,5 +7,5 @@ NAME="@@NAME@@" ...@@ -7,5 +7,5 @@ NAME="@@NAME@@"
VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")" VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")"
ELECTRON="$VSCODE_PATH/$NAME.exe" ELECTRON="$VSCODE_PATH/$NAME.exe"
CLI="$VSCODE_PATH/resources/app/out/cli.js" CLI="$VSCODE_PATH/resources/app/out/cli.js"
ELECTRON_NO_ATTACH_CONSOLE=1 ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" ELECTRON_NO_ATTACH_CONSOLE=1 ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
exit $? exit $?
...@@ -26,7 +26,7 @@ function code() { ...@@ -26,7 +26,7 @@ function code() {
CLI="$ROOT/out/cli.js" CLI="$ROOT/out/cli.js"
ELECTRON_RUN_AS_NODE=1 \ ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
NODE_ENV=development \ NODE_ENV=development \
VSCODE_DEV=1 \ VSCODE_DEV=1 \
ELECTRON_ENABLE_LOGGING=1 \ ELECTRON_ENABLE_LOGGING=1 \
......
...@@ -4,7 +4,7 @@ setlocal ...@@ -4,7 +4,7 @@ setlocal
rem APPVEYOR Builds rem APPVEYOR Builds
if not "%APPVEYOR%" == "" ( if not "%APPVEYOR%" == "" (
set ELECTRON_NO_ATTACH_CONSOLE=1 set ELECTRON_NO_ATTACH_CONSOLE=1
set ELECTRON_RUN_AS_NODE= set ATOM_SHELL_INTERNAL_RUN_AS_NODE=
) )
:: Integration Tests :: Integration Tests
......
@echo off @echo off
setlocal setlocal
set ELECTRON_RUN_AS_NODE=1 set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
rem TFS Builds rem TFS Builds
if not "%BUILD_BUILDID%" == "" ( if not "%BUILD_BUILDID%" == "" (
......
...@@ -21,11 +21,11 @@ test -d out || ./node_modules/.bin/gulp compile ...@@ -21,11 +21,11 @@ test -d out || ./node_modules/.bin/gulp compile
# 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
...@@ -49,7 +49,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string ...@@ -49,7 +49,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['STDERR_PIPE_NAME'] = stdErrPipeName; newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
newEnv['ELECTRON_RUN_AS_NODE'] = '1'; newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
return newEnv; return newEnv;
} }
......
...@@ -33,7 +33,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME']; ...@@ -33,7 +33,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDIN_PIPE_NAME: ' + stdInPipeName);
log('STDOUT_PIPE_NAME: ' + stdOutPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
log('STDERR_PIPE_NAME: ' + stdErrPipeName); log('STDERR_PIPE_NAME: ' + stdErrPipeName);
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() {
...@@ -149,7 +149,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); ...@@ -149,7 +149,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
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['STDERR_PIPE_NAME']; delete process.env['STDERR_PIPE_NAME'];
delete process.env['ELECTRON_RUN_AS_NODE']; delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
require(program); require(program);
......
...@@ -285,11 +285,11 @@ interface IEnv { ...@@ -285,11 +285,11 @@ interface IEnv {
function getUnixUserEnvironment(): TPromise<IEnv> { function getUnixUserEnvironment(): TPromise<IEnv> {
const promise = new TPromise((c, e) => { const promise = new TPromise((c, e) => {
const runAsNode = process.env['ELECTRON_RUN_AS_NODE']; const runAsNode = process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE']; const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE'];
const env = assign({}, process.env, { const env = assign({}, process.env, {
ELECTRON_RUN_AS_NODE: '1', ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1',
ELECTRON_NO_ATTACH_CONSOLE: '1' ELECTRON_NO_ATTACH_CONSOLE: '1'
}); });
...@@ -321,9 +321,9 @@ function getUnixUserEnvironment(): TPromise<IEnv> { ...@@ -321,9 +321,9 @@ function getUnixUserEnvironment(): TPromise<IEnv> {
const env = JSON.parse(raw); const env = JSON.parse(raw);
if (runAsNode) { if (runAsNode) {
env['ELECTRON_RUN_AS_NODE'] = runAsNode; env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = runAsNode;
} else { } else {
delete env['ELECTRON_RUN_AS_NODE']; delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
} }
if (noAttach) { if (noAttach) {
......
...@@ -33,7 +33,7 @@ export function main(args: string[]): TPromise<void> { ...@@ -33,7 +33,7 @@ export function main(args: string[]): TPromise<void> {
'VSCODE_CLI': '1', 'VSCODE_CLI': '1',
'ELECTRON_NO_ATTACH_CONSOLE': '1' 'ELECTRON_NO_ATTACH_CONSOLE': '1'
}); });
delete env['ELECTRON_RUN_AS_NODE']; delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
let options = { let options = {
detached: true, detached: true,
......
...@@ -593,7 +593,7 @@ export class DebugService implements debug.IDebugService { ...@@ -593,7 +593,7 @@ export class DebugService implements debug.IDebugService {
timeout: 1000 * 60 * 5, timeout: 1000 * 60 * 5,
args: [`${ publisher }.${ type }`, JSON.stringify(data), aiKey], args: [`${ publisher }.${ type }`, JSON.stringify(data), aiKey],
env: { env: {
ELECTRON_RUN_AS_NODE: 1, ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
PIPE_LOGGING: 'true', PIPE_LOGGING: 'true',
AMD_ENTRYPOINT: 'vs/workbench/parts/debug/node/telemetryApp' AMD_ENTRYPOINT: 'vs/workbench/parts/debug/node/telemetryApp'
} }
......
...@@ -157,7 +157,7 @@ function createRemoteRawGitService(gitPath: string, workspaceRoot: string, encod ...@@ -157,7 +157,7 @@ function createRemoteRawGitService(gitPath: string, workspaceRoot: string, encod
timeout: 1000 * 60, timeout: 1000 * 60,
args: [path, workspaceRoot, encoding, remote.process.execPath, version], args: [path, workspaceRoot, encoding, remote.process.execPath, version],
env: { env: {
ELECTRON_RUN_AS_NODE: 1, ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
PIPE_LOGGING: 'true', PIPE_LOGGING: 'true',
AMD_ENTRYPOINT: 'vs/workbench/parts/git/node/gitApp', AMD_ENTRYPOINT: 'vs/workbench/parts/git/node/gitApp',
VERBOSE_LOGGING: String(verbose) VERBOSE_LOGGING: String(verbose)
......
...@@ -63,7 +63,7 @@ function getArgs() { ...@@ -63,7 +63,7 @@ function getArgs() {
function cleanEnv() { function cleanEnv() {
var keys = [ var keys = [
'ELECTRON_RUN_AS_NODE', 'ATOM_SHELL_INTERNAL_RUN_AS_NODE',
'PTYCWD', 'PTYCWD',
'PTYPID', 'PTYPID',
'PTYSHELL' 'PTYSHELL'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册