Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8
提交
af607b1d
D
dragonwell8
项目概览
openanolis
/
dragonwell8
通知
5
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
af607b1d
编写于
10月 01, 2013
作者:
I
ihse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8006661: Use LC_ALL=C instead of LANG=C compare.sh
Reviewed-by: tbell
上级
a2f8ce2b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
14 deletion
+14
-14
common/bin/compare.sh
common/bin/compare.sh
+14
-14
未找到文件。
common/bin/compare.sh
浏览文件 @
af607b1d
...
...
@@ -76,13 +76,13 @@ diff_text() {
TMP
=
1
if
[[
"
$THIS_FILE
"
=
*
"META-INF/MANIFEST.MF"
]]
;
then
TMP
=
$(
L
ANG
=
C
$DIFF
$OTHER_FILE
$THIS_FILE
|
\
TMP
=
$(
L
C_ALL
=
C
$DIFF
$OTHER_FILE
$THIS_FILE
|
\
$GREP
'^[<>]'
|
\
$SED
-e
'/[<>] Ant-Version: Apache Ant .*/d'
\
-e
'/[<>] Created-By: .* (Oracle Corporation).*/d'
)
fi
if
test
"x
$SUFFIX
"
=
"xjava"
;
then
TMP
=
$(
L
ANG
=
C
$DIFF
$OTHER_FILE
$THIS_FILE
|
\
TMP
=
$(
L
C_ALL
=
C
$DIFF
$OTHER_FILE
$THIS_FILE
|
\
$GREP
'^[<>]'
|
\
$SED
-e
'/[<>] \* from.*\.idl/d'
\
-e
'/[<>] \*.*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d'
\
...
...
@@ -121,8 +121,8 @@ diff_text() {
# | $SED -e '/^#/d' -e '/^$/d' \
# -e :a -e '/\\$/N; s/\\\n//; ta' \
# -e 's/^[ \t]*//;s/[ \t]*$//' \
# -e 's/\\=/=/' | L
ANG
=C $SORT > $OTHER_FILE.cleaned
TMP
=
$(
L
ANG
=
C
$DIFF
$OTHER_FILE
.cleaned
$THIS_FILE
)
# -e 's/\\=/=/' | L
C_ALL
=C $SORT > $OTHER_FILE.cleaned
TMP
=
$(
L
C_ALL
=
C
$DIFF
$OTHER_FILE
.cleaned
$THIS_FILE
)
fi
if
test
-n
"
$TMP
"
;
then
echo
Files
$OTHER_FILE
and
$THIS_FILE
differ
...
...
@@ -410,11 +410,11 @@ compare_zip_file() {
CONTENTS_DIFF_FILE
=
$WORK_DIR
/
$ZIP_FILE
.diff
# On solaris, there is no -q option.
if
[
"
$OPENJDK_TARGET_OS
"
=
"solaris"
]
;
then
L
ANG
=
C
$DIFF
-r
$OTHER_UNZIPDIR
$THIS_UNZIPDIR
\
L
C_ALL
=
C
$DIFF
-r
$OTHER_UNZIPDIR
$THIS_UNZIPDIR
\
|
$GREP
-v
-e
"^<"
-e
"^>"
-e
"^Common subdirectories:"
\
>
$CONTENTS_DIFF_FILE
else
L
ANG
=
C
$DIFF
-rq
$OTHER_UNZIPDIR
$THIS_UNZIPDIR
>
$CONTENTS_DIFF_FILE
L
C_ALL
=
C
$DIFF
-rq
$OTHER_UNZIPDIR
$THIS_UNZIPDIR
>
$CONTENTS_DIFF_FILE
fi
ONLY_OTHER
=
$(
$GREP
"^Only in
$OTHER_UNZIPDIR
"
$CONTENTS_DIFF_FILE
)
...
...
@@ -459,11 +459,11 @@ compare_zip_file() {
if
[
-n
"
$SHOW_DIFFS
"
]
;
then
for
i
in
$(
cat
$WORK_DIR
/
$ZIP_FILE
.difflist
)
;
do
if
[
-f
"
${
OTHER_UNZIPDIR
}
/
$i
.javap"
]
;
then
L
ANG
=
C
$DIFF
${
OTHER_UNZIPDIR
}
/
$i
.javap
${
THIS_UNZIPDIR
}
/
$i
.javap
L
C_ALL
=
C
$DIFF
${
OTHER_UNZIPDIR
}
/
$i
.javap
${
THIS_UNZIPDIR
}
/
$i
.javap
elif
[
-f
"
${
OTHER_UNZIPDIR
}
/
$i
.cleaned"
]
;
then
L
ANG
=
C
$DIFF
${
OTHER_UNZIPDIR
}
/
$i
.cleaned
${
THIS_UNZIPDIR
}
/
$i
L
C_ALL
=
C
$DIFF
${
OTHER_UNZIPDIR
}
/
$i
.cleaned
${
THIS_UNZIPDIR
}
/
$i
else
L
ANG
=
C
$DIFF
${
OTHER_UNZIPDIR
}
/
$i
${
THIS_UNZIPDIR
}
/
$i
L
C_ALL
=
C
$DIFF
${
OTHER_UNZIPDIR
}
/
$i
${
THIS_UNZIPDIR
}
/
$i
fi
done
fi
...
...
@@ -703,7 +703,7 @@ compare_bin_file() {
$NM
-a
$ORIG_THIS_FILE
2> /dev/null |
$GREP
-v
$NAME
|
$AWK
'{print $2, $3, $4, $5}'
|
$SYM_SORT_CMD
>
$WORK_FILE_BASE
.symbols.this
fi
L
ANG
=
C
$DIFF
$WORK_FILE_BASE
.symbols.other
$WORK_FILE_BASE
.symbols.this
>
$WORK_FILE_BASE
.symbols.diff
L
C_ALL
=
C
$DIFF
$WORK_FILE_BASE
.symbols.other
$WORK_FILE_BASE
.symbols.this
>
$WORK_FILE_BASE
.symbols.diff
if
[
-s
$WORK_FILE_BASE
.symbols.diff
]
;
then
SYM_MSG
=
" diff "
if
[[
"
$ACCEPTED_SYM_DIFF
"
!=
*
"
$BIN_FILE
"
*
]]
;
then
...
...
@@ -732,8 +732,8 @@ compare_bin_file() {
(
cd
$FILE_WORK_DIR
&&
$CP
$THIS_FILE
.
&&
$LDD_CMD
$NAME
2</dev/null |
$AWK
'{ print $1;}'
|
$SORT
|
$TEE
$WORK_FILE_BASE
.deps.this |
$UNIQ
>
$WORK_FILE_BASE
.deps.this.uniq
)
(
cd
$FILE_WORK_DIR
&&
$RM
-f
$NAME
)
L
ANG
=
C
$DIFF
$WORK_FILE_BASE
.deps.other
$WORK_FILE_BASE
.deps.this
>
$WORK_FILE_BASE
.deps.diff
L
ANG
=
C
$DIFF
$WORK_FILE_BASE
.deps.other.uniq
$WORK_FILE_BASE
.deps.this.uniq
>
$WORK_FILE_BASE
.deps.diff.uniq
L
C_ALL
=
C
$DIFF
$WORK_FILE_BASE
.deps.other
$WORK_FILE_BASE
.deps.this
>
$WORK_FILE_BASE
.deps.diff
L
C_ALL
=
C
$DIFF
$WORK_FILE_BASE
.deps.other.uniq
$WORK_FILE_BASE
.deps.this.uniq
>
$WORK_FILE_BASE
.deps.diff.uniq
if
[
-s
$WORK_FILE_BASE
.deps.diff
]
;
then
if
[
-s
$WORK_FILE_BASE
.deps.diff.uniq
]
;
then
...
...
@@ -768,7 +768,7 @@ compare_bin_file() {
if
[
-n
"
$FULLDUMP_CMD
"
]
&&
[
-z
"
$SKIP_FULLDUMP_DIFF
"
]
;
then
$FULLDUMP_CMD
$OTHER_FILE
>
$WORK_FILE_BASE
.fulldump.other 2>&1
$FULLDUMP_CMD
$THIS_FILE
>
$WORK_FILE_BASE
.fulldump.this 2>&1
L
ANG
=
C
$DIFF
$WORK_FILE_BASE
.fulldump.other
$WORK_FILE_BASE
.fulldump.this
>
$WORK_FILE_BASE
.fulldump.diff
L
C_ALL
=
C
$DIFF
$WORK_FILE_BASE
.fulldump.other
$WORK_FILE_BASE
.fulldump.this
>
$WORK_FILE_BASE
.fulldump.diff
if
[
-s
$WORK_FILE_BASE
.fulldump.diff
]
;
then
ELF_DIFF_SIZE
=
$(
ls
-n
$WORK_FILE_BASE
.fulldump.diff |
awk
'{print $5}'
)
...
...
@@ -802,7 +802,7 @@ compare_bin_file() {
$DIS_CMD
$OTHER_FILE
|
$GREP
-v
$NAME
|
$DIS_DIFF_FILTER
>
$WORK_FILE_BASE
.dis.other 2>&1
$DIS_CMD
$THIS_FILE
|
$GREP
-v
$NAME
|
$DIS_DIFF_FILTER
>
$WORK_FILE_BASE
.dis.this 2>&1
L
ANG
=
C
$DIFF
$WORK_FILE_BASE
.dis.other
$WORK_FILE_BASE
.dis.this
>
$WORK_FILE_BASE
.dis.diff
L
C_ALL
=
C
$DIFF
$WORK_FILE_BASE
.dis.other
$WORK_FILE_BASE
.dis.this
>
$WORK_FILE_BASE
.dis.diff
if
[
-s
$WORK_FILE_BASE
.dis.diff
]
;
then
DIS_DIFF_SIZE
=
$(
ls
-n
$WORK_FILE_BASE
.dis.diff |
awk
'{print $5}'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录