Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
15d1ffe2
J
jenkins
项目概览
FIY695
/
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,发现更多精彩内容 >>
提交
15d1ffe2
编写于
10月 31, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
normalizing the options handling
上级
e7cc1410
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
3 deletion
+14
-3
core/src/main/java/hudson/tools/JDKInstaller.java
core/src/main/java/hudson/tools/JDKInstaller.java
+14
-3
未找到文件。
core/src/main/java/hudson/tools/JDKInstaller.java
浏览文件 @
15d1ffe2
...
@@ -225,11 +225,14 @@ public class JDKInstaller extends ToolInstaller {
...
@@ -225,11 +225,14 @@ public class JDKInstaller extends ToolInstaller {
ArgumentListBuilder
args
=
new
ArgumentListBuilder
();
ArgumentListBuilder
args
=
new
ArgumentListBuilder
();
args
.
add
(
jdkBundle
);
args
.
add
(
jdkBundle
);
args
.
add
(
"/s"
);
if
(
isJava15
()
||
isJava14
())
{
args
.
add
(
"/s"
,
"/v/qn REBOOT=ReallySuppress INSTALLDIR=\\\""
+
expectedLocation
+
"\\\" /L \\\""
+
logFile
+
"\\\""
);
}
else
{
// modern version supports arguments in more sane format.
args
.
add
(
"/s"
,
"/v"
,
"/qn"
,
"/L"
,
"\\\""
+
logFile
+
"\\\""
,
"REBOOT=ReallySuppress"
,
"INSTALLDIR=\\\""
+
expectedLocation
+
"\\\""
);
}
// according to http://community.acresso.com/showthread.php?t=83301, \" is the trick to quote values with whitespaces.
// 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?
// Oh Windows, oh windows, why do you have to be so difficult?
args
.
add
(
"/v/qn REBOOT=ReallySuppress INSTALLDIR=\\\""
+
expectedLocation
+
"\\\" /L \\\""
+
logFile
+
"\\\""
);
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
)
{
...
@@ -250,6 +253,14 @@ public class JDKInstaller extends ToolInstaller {
...
@@ -250,6 +253,14 @@ public class JDKInstaller extends ToolInstaller {
}
}
}
}
private
boolean
isJava15
()
{
return
id
.
contains
(
"-1.5"
);
}
private
boolean
isJava14
()
{
return
id
.
contains
(
"-1.4"
);
}
/**
/**
* Abstraction of the file system to perform JDK installation.
* Abstraction of the file system to perform JDK installation.
* Consider {@link FilePathFileSystem} as the canonical documentation of the contract.
* Consider {@link FilePathFileSystem} as the canonical documentation of the contract.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录