Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
05254667
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05254667
编写于
7月 08, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
back to ATOM_SHELL_INTERNAL_RUN_AS_NODE
上级
5aa8cf26
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
24 addition
and
24 deletion
+24
-24
appveyor.yml
appveyor.yml
+1
-1
extensions/typescript/src/utils/electron.ts
extensions/typescript/src/utils/electron.ts
+1
-1
extensions/typescript/src/utils/electronForkStart.ts
extensions/typescript/src/utils/electronForkStart.ts
+2
-2
resources/darwin/bin/code.sh
resources/darwin/bin/code.sh
+1
-1
resources/linux/bin/code.sh
resources/linux/bin/code.sh
+1
-1
resources/win32/bin/code.cmd
resources/win32/bin/code.cmd
+1
-1
resources/win32/bin/code.sh
resources/win32/bin/code.sh
+1
-1
scripts/code-cli.sh
scripts/code-cli.sh
+1
-1
scripts/test-integration.bat
scripts/test-integration.bat
+1
-1
scripts/test.bat
scripts/test.bat
+1
-1
scripts/test.sh
scripts/test.sh
+2
-2
src/vs/base/node/stdFork.ts
src/vs/base/node/stdFork.ts
+1
-1
src/vs/base/node/stdForkStart.js
src/vs/base/node/stdForkStart.js
+2
-2
src/vs/code/electron-main/main.ts
src/vs/code/electron-main/main.ts
+4
-4
src/vs/code/node/cli.ts
src/vs/code/node/cli.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+1
-1
src/vs/workbench/parts/git/electron-browser/electronGitService.ts
...orkbench/parts/git/electron-browser/electronGitService.ts
+1
-1
src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
...kbench/parts/terminal/electron-browser/terminalProcess.js
+1
-1
未找到文件。
appveyor.yml
浏览文件 @
05254667
environment
:
ELECTRON
_RUN_AS_NODE
:
1
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
:
1
install
:
-
ps
:
Install-Product node 5.10.1 x64
...
...
extensions/typescript/src/utils/electron.ts
浏览文件 @
05254667
...
...
@@ -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
[
'
ELECTRON
_RUN_AS_NODE
'
]
=
'
1
'
;
newEnv
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
]
=
'
1
'
;
return
newEnv
;
}
...
...
extensions/typescript/src/utils/electronForkStart.ts
浏览文件 @
05254667
...
...
@@ -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
(
'
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
()
{
...
...
@@ -147,7 +147,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
delete
process
.
env
[
'
STDIN_PIPE_NAME
'
];
delete
process
.
env
[
'
STDOUT_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
);
...
...
resources/darwin/bin/code.sh
浏览文件 @
05254667
...
...
@@ -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"
ELECTRON
_RUN_AS_NODE
=
1
"
$ELECTRON
"
"
$CLI
"
"
$@
"
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
"
$ELECTRON
"
"
$CLI
"
"
$@
"
exit
$?
\ No newline at end of file
resources/linux/bin/code.sh
浏览文件 @
05254667
...
...
@@ -33,5 +33,5 @@ fi
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
$?
\ No newline at end of file
resources/win32/bin/code.cmd
浏览文件 @
05254667
@echo
off
setlocal
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"
%
*
endlocal
\ No newline at end of file
resources/win32/bin/code.sh
浏览文件 @
05254667
...
...
@@ -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
ELECTRON
_RUN_AS_NODE
=
1
"
$ELECTRON
"
"
$CLI
"
"
$@
"
ELECTRON_NO_ATTACH_CONSOLE
=
1
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
"
$ELECTRON
"
"
$CLI
"
"
$@
"
exit
$?
scripts/code-cli.sh
浏览文件 @
05254667
...
...
@@ -26,7 +26,7 @@ function code() {
CLI
=
"
$ROOT
/out/cli.js"
ELECTRON
_RUN_AS_NODE
=
1
\
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
\
NODE_ENV
=
development
\
VSCODE_DEV
=
1
\
ELECTRON_ENABLE_LOGGING
=
1
\
...
...
scripts/test-integration.bat
浏览文件 @
05254667
...
...
@@ -4,7 +4,7 @@ setlocal
rem APPVEYOR Builds
if
not
"
%APPVEYOR%
"
==
""
(
set
ELECTRON_NO_ATTACH_CONSOLE
=
1
set
ELECTRON
_RUN_AS_NODE
=
set
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
)
:: Integration Tests
...
...
scripts/test.bat
浏览文件 @
05254667
@echo
off
setlocal
set
ELECTRON
_RUN_AS_NODE
=
1
set
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
rem TFS Builds
if
not
"
%BUILD_BUILDID%
"
==
""
(
...
...
scripts/test.sh
浏览文件 @
05254667
...
...
@@ -21,11 +21,11 @@ test -d out || ./node_modules/.bin/gulp compile
# 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
src/vs/base/node/stdFork.ts
浏览文件 @
05254667
...
...
@@ -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
[
'
ELECTRON
_RUN_AS_NODE
'
]
=
'
1
'
;
newEnv
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
]
=
'
1
'
;
return
newEnv
;
}
...
...
src/vs/base/node/stdForkStart.js
浏览文件 @
05254667
...
...
@@ -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
(
'
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
()
{
...
...
@@ -149,7 +149,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
delete
process
.
env
[
'
STDIN_PIPE_NAME
'
];
delete
process
.
env
[
'
STDOUT_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
);
...
...
src/vs/code/electron-main/main.ts
浏览文件 @
05254667
...
...
@@ -285,11 +285,11 @@ interface IEnv {
function
getUnixUserEnvironment
():
TPromise
<
IEnv
>
{
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
env
=
assign
({},
process
.
env
,
{
ELECTRON
_RUN_AS_NODE
:
'
1
'
,
ATOM_SHELL_INTERNAL
_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
[
'
ELECTRON
_RUN_AS_NODE
'
]
=
runAsNode
;
env
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
]
=
runAsNode
;
}
else
{
delete
env
[
'
ELECTRON
_RUN_AS_NODE
'
];
delete
env
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
];
}
if
(
noAttach
)
{
...
...
src/vs/code/node/cli.ts
浏览文件 @
05254667
...
...
@@ -33,7 +33,7 @@ export function main(args: string[]): TPromise<void> {
'
VSCODE_CLI
'
:
'
1
'
,
'
ELECTRON_NO_ATTACH_CONSOLE
'
:
'
1
'
});
delete
env
[
'
ELECTRON
_RUN_AS_NODE
'
];
delete
env
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
];
let
options
=
{
detached
:
true
,
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
05254667
...
...
@@ -593,7 +593,7 @@ export class DebugService implements debug.IDebugService {
timeout
:
1000
*
60
*
5
,
args
:
[
`
${
publisher
}
.
${
type
}
`
,
JSON
.
stringify
(
data
),
aiKey
],
env
:
{
ELECTRON
_RUN_AS_NODE
:
1
,
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
:
1
,
PIPE_LOGGING
:
'
true
'
,
AMD_ENTRYPOINT
:
'
vs/workbench/parts/debug/node/telemetryApp
'
}
...
...
src/vs/workbench/parts/git/electron-browser/electronGitService.ts
浏览文件 @
05254667
...
...
@@ -157,7 +157,7 @@ function createRemoteRawGitService(gitPath: string, workspaceRoot: string, encod
timeout
:
1000
*
60
,
args
:
[
path
,
workspaceRoot
,
encoding
,
remote
.
process
.
execPath
,
version
],
env
:
{
ELECTRON
_RUN_AS_NODE
:
1
,
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
:
1
,
PIPE_LOGGING
:
'
true
'
,
AMD_ENTRYPOINT
:
'
vs/workbench/parts/git/node/gitApp
'
,
VERBOSE_LOGGING
:
String
(
verbose
)
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js
浏览文件 @
05254667
...
...
@@ -63,7 +63,7 @@ function getArgs() {
function
cleanEnv
()
{
var
keys
=
[
'
ELECTRON
_RUN_AS_NODE
'
,
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
,
'
PTYCWD
'
,
'
PTYPID
'
,
'
PTYSHELL
'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录