Mercurial > hg > openjdk > jdk7u > jdk
changeset 819:87f2193da40d jdk7u60-b03
Merge
| author | asaha |
|---|---|
| date | Tue, 31 Dec 2013 09:38:17 -0800 |
| parents | be9f82c65e80 (diff) b5ea303f23a5 (current diff) |
| children | d4397128f8b6 |
| files | .hgtags |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 31 08:51:46 2013 -0800 +++ b/.hgtags Tue Dec 31 09:38:17 2013 -0800 @@ -357,6 +357,7 @@ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43 dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60 +11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61 a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62 07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02 @@ -396,3 +397,6 @@ 6c778574d87336a2e55156544af92ce2de799696 jdk7u51-b13 d2eeac0235eda77d0a6c72c7235a6e96bc9ad4fb jdk7u51-b30 626e76f127a44ba0118a545d37410f80000db8fb jdk7u51-b31 +11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 +88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01 +6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
--- a/make/scripts/webrev.ksh Tue Dec 31 08:51:46 2013 -0800 +++ b/make/scripts/webrev.ksh Tue Dec 31 09:38:17 2013 -0800 @@ -2695,11 +2695,11 @@ rm -f $WDIR/$DIR/$F.html its_a_jar= - if expr $F : '.*\.jar' >/dev/null; then + if expr $F : '.*\.jar' \| $F : '.*\.zip' >/dev/null; then its_a_jar=1 - # It's a JAR file, let's do it differntly + # It's a JAR or ZIP file, let's do it differently if [[ -z $JAR ]]; then - print "No access to jar, so can't produce diffs for jar files" + print "No access to jar, so can't produce diffs for jar or zip files" else if [ -f $ofile ]; then $JAR -tvf $ofile >"$ofile".lst