Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野花太放肆
jenkins
提交
9ec37cc0
J
jenkins
项目概览
野花太放肆
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ec37cc0
编写于
10月 02, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'JENKINS-8957' of
https://github.com/cowwoc/jenkins
into cowwoc-JENKINS-8957
上级
ea85489a
4f6e6492
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
6 deletion
+23
-6
core/src/main/java/hudson/tools/JDKInstaller.java
core/src/main/java/hudson/tools/JDKInstaller.java
+23
-6
未找到文件。
core/src/main/java/hudson/tools/JDKInstaller.java
浏览文件 @
9ec37cc0
...
@@ -224,16 +224,33 @@ public class JDKInstaller extends ToolInstaller {
...
@@ -224,16 +224,33 @@ public class JDKInstaller extends ToolInstaller {
*/
*/
String
logFile
=
jdkBundle
+
".install.log"
;
String
logFile
=
jdkBundle
+
".install.log"
;
expectedLocation
=
expectedLocation
.
trim
();
if
(
expectedLocation
.
endsWith
(
"\\"
))
{
// Prevent a trailing slash from escaping quotes
expectedLocation
=
expectedLocation
.
substring
(
0
,
expectedLocation
.
length
()
-
1
);
}
ArgumentListBuilder
args
=
new
ArgumentListBuilder
();
ArgumentListBuilder
args
=
new
ArgumentListBuilder
();
args
.
add
(
jdkBundle
);
assert
(
new
File
(
expectedLocation
).
exists
())
:
expectedLocation
+
" must exist, otherwise /L will cause the installer to fail with error 1622"
;
if
(
isJava15
()
||
isJava14
())
{
if
(
isJava15
()
||
isJava14
())
{
args
.
add
(
"/s"
,
"/v/qn REBOOT=ReallySuppress INSTALLDIR=\""
+
expectedLocation
+
"\" /L \""
+
logFile
+
"\""
);
// Installer uses InstallShield.
args
.
add
(
"CMD.EXE"
,
"/C"
);
// CMD.EXE /C must be followed by a single parameter (do not split it!)
args
.
add
(
jdkBundle
+
" /s /v\"/qn REBOOT=ReallySuppress INSTALLDIR=\\\""
+
expectedLocation
+
"\\\" /L \\\""
+
expectedLocation
+
"\\jdk.exe.install.log\\\"\""
);
}
else
{
}
else
{
// modern version supports arguments in more sane format.
// Installed uses Windows Installer (MSI)
args
.
add
(
"/s"
,
"/v"
,
"/qn"
,
"/L"
,
"\""
+
logFile
+
"\""
,
"REBOOT=ReallySuppress"
,
"INSTALLDIR=\""
+
expectedLocation
+
"\""
);
args
.
add
(
jdkBundle
,
"/s"
);
// Create a private JRE by omitting "PublicjreFeature"
// @see http://docs.oracle.com/javase/7/docs/webnotes/install/windows/jdk-installation-windows.html#jdk-silent-installation
args
.
add
(
"ADDLOCAL=\"ToolsFeature\""
);
args
.
add
(
"REBOOT=ReallySuppress"
,
"INSTALLDIR="
+
expectedLocation
,
"/L \\\""
+
expectedLocation
+
"\\jdk.exe.install.log\\\""
);
}
}
// according to http://community.acresso.com/showthread.php?t=83301, \" is the trick to quote values with whitespaces.
// Oh Windows, oh windows, why do you have to be so difficult?
int
r
=
launcher
.
launch
().
cmds
(
args
).
stdout
(
out
)
int
r
=
launcher
.
launch
().
cmds
(
args
).
stdout
(
out
)
.
pwd
(
new
FilePath
(
launcher
.
getChannel
(),
expectedLocation
)).
join
();
.
pwd
(
new
FilePath
(
launcher
.
getChannel
(),
expectedLocation
)).
join
();
if
(
r
!=
0
)
{
if
(
r
!=
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录