Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4821ad5f
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,发现更多精彩内容 >>
提交
4821ad5f
编写于
2月 12, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use ELECTRON_RUN_AS_NODE
上级
c0b72c16
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
15 addition
and
15 deletion
+15
-15
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/common/bin/code.sh
resources/common/bin/code.sh
+1
-1
resources/win32/bin/code.cmd
resources/win32/bin/code.cmd
+1
-1
resources/win32/bin/code.js
resources/win32/bin/code.js
+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/workbench/electron-main/cli.ts
src/vs/workbench/electron-main/cli.ts
+1
-1
src/vs/workbench/parts/git/electron-browser/electronGitService.ts
...orkbench/parts/git/electron-browser/electronGitService.ts
+1
-1
未找到文件。
appveyor.yml
浏览文件 @
4821ad5f
environment
:
environment
:
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
:
1
ELECTRON
_RUN_AS_NODE
:
1
install
:
install
:
-
ps
:
Install-Product node 4.1.1 x64
-
ps
:
Install-Product node 4.1.1 x64
...
...
extensions/typescript/src/utils/electron.ts
浏览文件 @
4821ad5f
...
@@ -47,7 +47,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
...
@@ -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
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
]
=
'
1
'
;
newEnv
[
'
ELECTRON
_RUN_AS_NODE
'
]
=
'
1
'
;
return
newEnv
;
return
newEnv
;
}
}
...
...
extensions/typescript/src/utils/electronForkStart.ts
浏览文件 @
4821ad5f
...
@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
...
@@ -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
(
'
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
// stdout redirection to named pipe
(
function
()
{
(
function
()
{
...
@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
...
@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
// 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
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
];
delete
process
.
env
[
'
ELECTRON
_RUN_AS_NODE
'
];
require
(
program
);
require
(
program
);
...
...
resources/common/bin/code.sh
浏览文件 @
4821ad5f
...
@@ -15,6 +15,6 @@ fi
...
@@ -15,6 +15,6 @@ fi
VSCODE_LAUNCHER
=
"
$VSCODE_DIR
/resources/app/out/cli.js"
VSCODE_LAUNCHER
=
"
$VSCODE_DIR
/resources/app/out/cli.js"
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
VSCODE_PATH
=
"
$VSCODE_DIR
/
$ELECTRON_FILE
"
\
ELECTRON
_RUN_AS_NODE
=
1
VSCODE_PATH
=
"
$VSCODE_DIR
/
$ELECTRON_FILE
"
\
"
$VSCODE_DIR
/
$ELECTRON_FILE
"
$VSCODE_LAUNCHER
"
$@
"
"
$VSCODE_DIR
/
$ELECTRON_FILE
"
$VSCODE_LAUNCHER
"
$@
"
exit
$?
exit
$?
resources/win32/bin/code.cmd
浏览文件 @
4821ad5f
@echo
off
@echo
off
setlocal
setlocal
set
VSCODE_DEV
=
set
VSCODE_DEV
=
set
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
set
ELECTRON
_RUN_AS_NODE
=
1
"
%~dp0
..\\Code.exe"
"
%~dp0
code.js"
%
*
"
%~dp0
..\\Code.exe"
"
%~dp0
code.js"
%
*
endlocal
endlocal
\ No newline at end of file
resources/win32/bin/code.js
浏览文件 @
4821ad5f
delete
process
.
env
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
];
delete
process
.
env
[
'
ELECTRON
_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
);
\ No newline at end of file
scripts/test.bat
浏览文件 @
4821ad5f
@echo
off
@echo
off
set
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
set
ELECTRON
_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
%
*
...
...
scripts/test.sh
浏览文件 @
4821ad5f
...
@@ -10,11 +10,11 @@ fi
...
@@ -10,11 +10,11 @@ fi
# Unit Tests
# Unit Tests
if
[[
"
$OSTYPE
"
==
"darwin"
*
]]
;
then
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
\
./.build/electron/Electron.app/Contents/MacOS/Electron
\
node_modules/mocha/bin/_mocha
$*
node_modules/mocha/bin/_mocha
$*
else
else
cd
$ROOT
;
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
=
1
\
cd
$ROOT
;
ELECTRON
_RUN_AS_NODE
=
1
\
./.build/electron/electron
\
./.build/electron/electron
\
node_modules/mocha/bin/_mocha
$*
node_modules/mocha/bin/_mocha
$*
fi
fi
...
...
src/vs/base/node/stdFork.ts
浏览文件 @
4821ad5f
...
@@ -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
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
]
=
'
1
'
;
newEnv
[
'
ELECTRON
_RUN_AS_NODE
'
]
=
'
1
'
;
return
newEnv
;
return
newEnv
;
}
}
...
...
src/vs/base/node/stdForkStart.js
浏览文件 @
4821ad5f
...
@@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME'];
...
@@ -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
(
'
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
// stdout redirection to named pipe
(
function
()
{
(
function
()
{
...
@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
...
@@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
// 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
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
];
delete
process
.
env
[
'
ELECTRON
_RUN_AS_NODE
'
];
require
(
program
);
require
(
program
);
...
...
src/vs/workbench/electron-main/cli.ts
浏览文件 @
4821ad5f
...
@@ -45,7 +45,7 @@ export function main(argv: string[]) {
...
@@ -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
[
'
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
'
];
delete
process
.
env
[
'
ELECTRON
_RUN_AS_NODE
'
];
spawn
(
process
.
env
[
'
VSCODE_PATH
'
],
process
.
argv
.
slice
(
2
),
{
detached
:
true
,
stdio
:
'
ignore
'
});
spawn
(
process
.
env
[
'
VSCODE_PATH
'
],
process
.
argv
.
slice
(
2
),
{
detached
:
true
,
stdio
:
'
ignore
'
});
}
}
...
...
src/vs/workbench/parts/git/electron-browser/electronGitService.ts
浏览文件 @
4821ad5f
...
@@ -117,7 +117,7 @@ export function createNativeRawGitService(workspaceRoot: string, gitPath: string
...
@@ -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
:
{
ATOM_SHELL_INTERNAL
_RUN_AS_NODE
:
1
,
ELECTRON
_RUN_AS_NODE
:
1
,
AMD_ENTRYPOINT
:
'
vs/workbench/parts/git/electron-browser/gitApp
'
AMD_ENTRYPOINT
:
'
vs/workbench/parts/git/electron-browser/gitApp
'
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录