1 #!/bin/bash
2 #
3 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 #
6 # This code is free software; you can redistribute it and/or modify it
7 # under the terms of the GNU General Public License version 2 only, as
8 # published by the Free Software Foundation.
9 #
10 # This code is distributed in the hope that it will be useful, but WITHOUT
11 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13 # version 2 for more details (a copy is included in the LICENSE file that
14 # accompanied this code).
15 #
16 # You should have received a copy of the GNU General Public License version
17 # 2 along with this work; if not, write to the Free Software Foundation,
18 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19 #
20 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
21 # or visit www.oracle.com if you need additional information or have any
22 # questions.
23 #
24
25 # This script is processed by configure before it's usable. It is run from
26 # the root of the build directory.
27
28
29 ################################################################################
30
31 # Check that we are run via the wrapper generated by configure
32 if [ -z "$SRC_ROOT" ]; then
33 echo "Error: You must run this script using build/[conf]/compare.sh"
34 exit 1
35 fi
36
37 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
38 FULLDUMP_CMD="$OTOOL -v -V -h -X -d"
39 LDD_CMD="$OTOOL -L"
40 DIS_CMD="$OTOOL -v -V -t"
41 STAT_PRINT_SIZE="-f %z"
42 elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
43 FULLDUMP_CMD="$DUMPBIN -all"
44 LDD_CMD="$DUMPBIN -dependants | $GREP .dll"
45 DIS_CMD="$DUMPBIN -disasm:nobytes"
46 STAT_PRINT_SIZE="-c %s"
47 elif [ "$OPENJDK_TARGET_OS" = "aix" ]; then
48 FULLDUMP_CMD="dump -h -r -t -n -X64"
49 LDD_CMD="$LDD"
50 DIS_CMD="$OBJDUMP -d"
51 STAT_PRINT_SIZE="-c %s"
52 else
53 FULLDUMP_CMD="$READELF -a"
54 LDD_CMD="$LDD"
55 DIS_CMD="$OBJDUMP -d"
56 STAT_PRINT_SIZE="-c %s"
57 fi
58
59 COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
60 if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
61 echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"
62 exit 1
63 fi
64 # Include exception definitions
65 . "$COMPARE_EXCEPTIONS_INCLUDE"
66
67 ################################################################################
68 # Compare text files and ignore specific differences:
69 #
70 # * Timestamps in Java sources generated by idl2java
71 # * Sorting order and cleanup style in .properties files
72
73 diff_text() {
74 OTHER_FILE=$1
75 THIS_FILE=$2
76
77 SUFFIX="${THIS_FILE##*.}"
78
79 TMP=1
80
81 if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
82 # Filter out date string, ant version and java version differences.
83 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
84 $GREP '^[<>]' | \
85 $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
86 -e '/[<>] Created-By: .* (Oracle [Corpatin)]*/d' \
87 -e '/[<>] [Corpatin]*)/d' \
88 -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d')
89 fi
90 if test "x$SUFFIX" = "xjava"; then
91 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
92 $GREP '^[<>]' | \
93 $SED -e '/[<>] \* from.*\.idl/d' \
94 -e '/[<>] .*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
95 -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
96 -e '/\/\/ Generated from input file.*/d' \
97 -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
98 -e '/\/\/ java GenerateCharacter.*/d')
99 fi
100 # Ignore date strings in class files.
101 # Anonymous lambda classes get randomly assigned counters in their names.
102 if test "x$SUFFIX" = "xclass"; then
103 # To improve performance when large diffs are found, do a rough filtering of classes
104 # elibeble for these exceptions
105 if $GREP -R -e '[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}' \
106 -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then
107 $JAVAP -c -constants -l -p "${OTHER_FILE}" > ${OTHER_FILE}.javap
108 $JAVAP -c -constants -l -p "${THIS_FILE}" > ${THIS_FILE}.javap
109 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
110 $GREP '^[<>]' | \
111 $SED -e '/[<>].*[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.*/d' \
112 -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d')
113 fi
114 fi
115 if test "x$SUFFIX" = "xproperties"; then
116 # Filter out date string differences.
117 TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
118 $GREP '^[<>]' | \
119 $SED -e '/[<>].*[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.*/d')
120 fi
121 if test "x$SUFFIX" = "xhtml"; then
122 # Some javadoc versions do not put quotes around font size
123 HTML_FILTER="$SED \
124 -e 's/<font size=-1>/<font size=\"-1\">/g'"
125 $CAT $THIS_FILE | eval "$HTML_FILTER" > $THIS_FILE.filtered
126 $CAT $OTHER_FILE | eval "$HTML_FILTER" > $OTHER_FILE.filtered
127 TMP=$(LC_ALL=C $DIFF $OTHER_FILE.filtered $THIS_FILE.filtered | \
128 $GREP '^[<>]' | \
129 $SED -e '/[<>] <!-- Generated by javadoc .* on .* -->/d' \
130 -e '/[<>] <meta name="date" content=".*">/d' )
131 fi
132 if test -n "$TMP"; then
133 echo Files $OTHER_FILE and $THIS_FILE differ
134 return 1
135 fi
136
137 return 0
138 }
139
140 ################################################################################
141 # Compare directory structure
142
143 compare_dirs() {
144 THIS_DIR=$1
145 OTHER_DIR=$2
146 WORK_DIR=$3
147
148 mkdir -p $WORK_DIR
149
150 (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
151 (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
152
153 $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff
154
155 echo -n Directory structure...
156 if [ -s $WORK_DIR/dirs_diff ]; then
157 echo Differences found.
158 REGRESSIONS=true
159 # Differences in directories found.
160 ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff)
161 if [ "$ONLY_OTHER" ]; then
162 echo Only in $OTHER
163 $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./| |g'
164 fi
165 ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff)
166 if [ "$ONLY_THIS" ]; then
167 echo Only in $THIS
168 $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./| |g'
169 fi
170 else
171 echo Identical!
172 fi
173 }
174
175
176 ################################################################################
177 # Compare file structure
178
179 compare_files() {
180 THIS_DIR=$1
181 OTHER_DIR=$2
182 WORK_DIR=$3
183
184 $MKDIR -p $WORK_DIR
185
186 (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other)
187 (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this)
188
189 $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff
190
191 echo -n File names...
192 if [ -s $WORK_DIR/files_diff ]; then
193 echo Differences found.
194 REGRESSIONS=true
195 # Differences in files found.
196 ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff)
197 if [ "$ONLY_OTHER" ]; then
198 echo Only in $OTHER
199 $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./| |g'
200 fi
201 ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff)
202 if [ "$ONLY_THIS" ]; then
203 echo Only in $THIS
204 $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./| |g'
205 fi
206 else
207 echo Identical!
208 fi
209 }
210
211
212 ################################################################################
213 # Compare permissions
214
215 compare_permissions() {
216 THIS_DIR=$1
217 OTHER_DIR=$2
218 WORK_DIR=$3
219
220 mkdir -p $WORK_DIR
221
222 echo -n Permissions...
223 found=""
224 for f in `cd $OTHER_DIR && $FIND . -type f`
225 do
226 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
227 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
228 OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
229 TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
230 if [ "$OP" != "$TP" ]
231 then
232 if [ -z "$found" ]; then echo ; found="yes"; fi
233 $PRINTF "\tother: ${OP} this: ${TP}\t$f\n"
234 fi
235 done
236 if [ -z "$found" ]; then
237 echo "Identical!"
238 else
239 REGRESSIONS=true
240 fi
241 }
242
243 ################################################################################
244 # Compare file command output
245
246 compare_file_types() {
247 THIS_DIR=$1
248 OTHER_DIR=$2
249 WORK_DIR=$3
250
251 $MKDIR -p $WORK_DIR
252
253 echo -n File types...
254 found=""
255 for f in `cd $OTHER_DIR && $FIND . ! -type d`
256 do
257 if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
258 if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
259 OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
260 TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
261 if [ "$OF" != "$TF" ]
262 then
263 if [ "`echo $OF | $GREP -c 'Zip archive data'`" -gt 0 ] \
264 && [ "`echo $TF | $GREP -c 'Zip archive data'`" -gt 0 ]
265 then
266 # the way we produce zip-files make it so that directories are stored in
267 # old file but not in new (only files with full-path) this makes file
268 # report them as different
269 continue
270 else
271 if [ -z "$found" ]; then echo ; found="yes"; fi
272 $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
273 fi
274 fi
275 done
276 if [ -z "$found" ]; then
277 echo "Identical!"
278 else
279 REGRESSIONS=true
280 fi
281 }
282
283 ################################################################################
284 # Compare the rest of the files
285
286 compare_general_files() {
287 THIS_DIR=$1
288 OTHER_DIR=$2
289 WORK_DIR=$3
290
291 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" \
292 ! -name "*.zip" ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
293 ! -name "*.jimage" ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
294 ! -name "*.cpl" ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
295 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \
296 ! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" \
297 ! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \
298 ! -name "jspawnhelper" ! -name "JavawsLauncher" ! -name "*.a" \
299 ! -name "finish_installation" ! -name "Sparkle" \
300 | $GREP -v "./bin/" | $SORT | $FILTER)
301
302 echo Other files with binary differences...
303 for f in $GENERAL_FILES
304 do
305 if [ -e $OTHER_DIR/$f ]; then
306 SUFFIX="${f##*.}"
307 if [ "$(basename $f)" = "release" ]; then
308 # Ignore differences in change numbers in release file.
309 OTHER_FILE=$WORK_DIR/$f.other
310 THIS_FILE=$WORK_DIR/$f.this
311 $MKDIR -p $(dirname $OTHER_FILE)
312 $MKDIR -p $(dirname $THIS_FILE)
313 RELEASE_FILTER="$SED \
314 -e 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' \
315 -e 's/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g'
316 "
317 $CAT $OTHER_DIR/$f | eval "$RELEASE_FILTER" > $OTHER_FILE
318 $CAT $THIS_DIR/$f | eval "$RELEASE_FILTER" > $THIS_FILE
319 elif [ "x$SUFFIX" = "xhtml" ]; then
320 # Ignore time stamps in docs files
321 OTHER_FILE=$WORK_DIR/$f.other
322 THIS_FILE=$WORK_DIR/$f.this
323 $MKDIR -p $(dirname $OTHER_FILE) $(dirname $THIS_FILE)
324 # Older versions of compare might have left soft links with
325 # these names.
326 $RM $OTHER_FILE $THIS_FILE
327 #Note that | doesn't work on mac sed.
328 HTML_FILTER="$SED \
329 -e 's/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g' \
330 -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
331 -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [0-9]\{4\} [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/<DATE>/'
332 "
333 $CAT $OTHER_DIR/$f | eval "$HTML_FILTER" > $OTHER_FILE
334 $CAT $THIS_DIR/$f | eval "$HTML_FILTER" > $THIS_FILE
335 else
336 OTHER_FILE=$OTHER_DIR/$f
337 THIS_FILE=$THIS_DIR/$f
338 fi
339 DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1)
340 if [ -n "$DIFF_OUT" ]; then
341 echo $f
342 REGRESSIONS=true
343 if [ "$SHOW_DIFFS" = "true" ]; then
344 echo "$DIFF_OUT"
345 fi
346 fi
347 fi
348 done
349
350
351 }
352
353 ################################################################################
354 # Compare zip file
355
356 compare_zip_file() {
357 THIS_DIR=$1
358 OTHER_DIR=$2
359 WORK_DIR=$3
360 ZIP_FILE=$4
361 # Optionally provide different name for other zipfile
362 OTHER_ZIP_FILE=$5
363
364 THIS_ZIP=$THIS_DIR/$ZIP_FILE
365 if [ -n "$OTHER_ZIP_FILE" ]; then
366 OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE
367 else
368 OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
369 fi
370
371 THIS_SUFFIX="${THIS_ZIP##*.}"
372 OTHER_SUFFIX="${OTHER_ZIP##*.}"
373 if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then
374 echo "The files do not have the same suffix type! ($THIS_SUFFIX != $OTHER_SUFFIX)"
375 return 2
376 fi
377
378 TYPE="$THIS_SUFFIX"
379
380 if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null
381 then
382 return 0
383 fi
384 # Not quite identical, the might still contain the same data.
385 # Unpack the jar/zip files in temp dirs
386
387 THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
388 OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
389 $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
390 $MKDIR -p $THIS_UNZIPDIR
391 $MKDIR -p $OTHER_UNZIPDIR
392 if [ "$TYPE" = "jimage" ]
393 then
394 (cd $THIS_UNZIPDIR && $JIMAGE extract $THIS_ZIP)
395 (cd $OTHER_UNZIPDIR && $JIMAGE extract $OTHER_ZIP)
396 else
397 (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
398 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
399 fi
400
401 # Find all archives inside and unzip them as well to compare the contents rather than
402 # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
403 EXCEPTIONS="pie.jar.pack.gz"
404 for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
405 ($UNPACK200 $pack $pack.jar)
406 # Filter out the unzipped archives from the diff below.
407 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
408 done
409 for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
410 ($UNPACK200 $pack $pack.jar)
411 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
412 done
413 for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
414 $MKDIR $zip.unzip
415 (cd $zip.unzip && $UNARCHIVE $zip)
416 EXCEPTIONS="$EXCEPTIONS $zip"
417 done
418 for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
419 $MKDIR $zip.unzip
420 (cd $zip.unzip && $UNARCHIVE $zip)
421 EXCEPTIONS="$EXCEPTIONS $zip"
422 done
423
424 CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
425 # On solaris, there is no -q option.
426 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
427 LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
428 | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
429 > $CONTENTS_DIFF_FILE
430 else
431 LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
432 fi
433
434 ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
435 ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
436
437 return_value=0
438
439 if [ -n "$ONLY_OTHER" ]; then
440 echo " Only OTHER $ZIP_FILE contains:"
441 echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR| |"g | sed 's|: |/|g'
442 return_value=1
443 fi
444
445 if [ -n "$ONLY_THIS" ]; then
446 echo " Only THIS $ZIP_FILE contains:"
447 echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR| |"g | sed 's|: |/|g'
448 return_value=1
449 fi
450
451 if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
452 DIFFING_FILES=$($GREP -e 'differ$' -e '^diff ' $CONTENTS_DIFF_FILE \
453 | $SED -e 's/^Files //g' -e 's/diff -r //g' | $CUT -f 1 -d ' ' \
454 | $SED "s|$OTHER_UNZIPDIR/||g")
455 else
456 DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
457 | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
458 fi
459
460 $RM -f $WORK_DIR/$ZIP_FILE.diffs
461 for file in $DIFFING_FILES; do
462 if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then
463 diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
464 fi
465 done
466
467 if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
468 return_value=1
469 echo " Differing files in $ZIP_FILE"
470 $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP 'differ$' | cut -f 2 -d ' ' | \
471 $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist
472 $CAT $WORK_DIR/$ZIP_FILE.difflist
473
474 if [ -n "$SHOW_DIFFS" ]; then
475 for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
476 if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
477 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
478 elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
479 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
480 else
481 LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
482 fi
483 done
484 fi
485 fi
486
487 return $return_value
488 }
489
490
491 ################################################################################
492 # Compare all zip files
493
494 compare_all_zip_files() {
495 THIS_DIR=$1
496 OTHER_DIR=$2
497 WORK_DIR=$3
498
499 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER )
500
501 if [ -n "$ZIPS" ]; then
502 echo Zip files...
503
504 return_value=0
505 for f in $ZIPS; do
506 if [ -f "$OTHER_DIR/$f" ]; then
507 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
508 if [ "$?" != "0" ]; then
509 return_value=1
510 REGRESSIONS=true
511 fi
512 fi
513 done
514 fi
515
516 return $return_value
517 }
518
519 ################################################################################
520 # Compare all jar files
521
522 compare_all_jar_files() {
523 THIS_DIR=$1
524 OTHER_DIR=$2
525 WORK_DIR=$3
526
527 # TODO filter?
528 ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \
529 -o -name "*.jimage" | $SORT | $FILTER)
530
531 if [ -n "$ZIPS" ]; then
532 echo Jar files...
533
534 return_value=0
535 for f in $ZIPS; do
536 if [ -f "$OTHER_DIR/$f" ]; then
537 compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
538 if [ "$?" != "0" ]; then
539 return_value=1
540 REGRESSIONS=true
541 fi
542 fi
543 done
544 fi
545
546 return $return_value
547 }
548
549 ################################################################################
550 # Compare binary (executable/library) file
551
552 compare_bin_file() {
553 THIS_DIR=$1
554 OTHER_DIR=$2
555 WORK_DIR=$3
556 BIN_FILE=$4
557 OTHER_BIN_FILE=$5
558
559 THIS_FILE=$THIS_DIR/$BIN_FILE
560 if [ -n "$OTHER_BIN_FILE" ]; then
561 OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE
562 else
563 OTHER_FILE=$OTHER_DIR/$BIN_FILE
564 fi
565 NAME=$(basename $BIN_FILE)
566 WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
567 FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
568
569 $MKDIR -p $FILE_WORK_DIR
570
571 # Make soft links to original files from work dir to facilitate debugging
572 $LN -f -s $THIS_FILE $WORK_FILE_BASE.this
573 $LN -f -s $OTHER_FILE $WORK_FILE_BASE.other
574
575 ORIG_THIS_FILE="$THIS_FILE"
576 ORIG_OTHER_FILE="$OTHER_FILE"
577
578 if [ "$STRIP_ALL" = "true" ] || [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
579 THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
580 OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
581 $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
582 $CP $THIS_FILE $THIS_STRIPPED_FILE
583 $CP $OTHER_FILE $OTHER_STRIPPED_FILE
584 $STRIP $THIS_STRIPPED_FILE
585 $STRIP $OTHER_STRIPPED_FILE
586 THIS_FILE="$THIS_STRIPPED_FILE"
587 OTHER_FILE="$OTHER_STRIPPED_FILE"
588 fi
589
590 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
591 unset _NT_SYMBOL_PATH
592 # On windows we need to unzip the debug symbols, if present
593 OTHER_FILE_BASE=${OTHER_FILE/.dll/}
594 OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/}
595 OTHER_FILE_BASE=${OTHER_FILE_BASE/.cpl/}
596 DIZ_NAME=$(basename $OTHER_FILE_BASE).diz
597 # Some .exe files have the same name as a .dll file. Make sure the exe
598 # files get the right debug symbols.
599 if [ "$NAME" = "java.exe" ] \
600 && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then
601 OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz"
602 elif [ "$NAME" = "jimage.exe" ] \
603 && [ -f "$OTHER/support/native/jdk.dev/jimage_objs/jimage.diz" ]; then
604 OTHER_DIZ_FILE="$OTHER/support/native/jdk.dev/jimage_objs/jimage.diz"
605 elif [ "$NAME" = "javacpl.exe" ] \
606 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
607 OTHER_DIZ_FILE="$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz"
608 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
609 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
610 else
611 # Some files, jli.dll, appears twice in the image but only one of
612 # thme has a diz file next to it.
613 OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)"
614 if [ ! -f "$OTHER_DIZ_FILE" ]; then
615 # As a last resort, look for diz file in the whole build output
616 # dir.
617 OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)"
618 fi
619 fi
620 if [ -n "$OTHER_DIZ_FILE" ]; then
621 $MKDIR -p $FILE_WORK_DIR/other
622 (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE)
623 export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other"
624 fi
625
626 THIS_FILE_BASE=${THIS_FILE/.dll/}
627 THIS_FILE_BASE=${THIS_FILE_BASE/.exe/}
628 THIS_FILE_BASE=${THIS_FILE_BASE/.cpl/}
629 # Some .exe files have the same name as a .dll file. Make sure the exe
630 # files get the right debug symbols.
631 if [ "$NAME" = "java.exe" ] \
632 && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then
633 THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz"
634 elif [ "$NAME" = "jimage.exe" ] \
635 && [ -f "$THIS/support/native/jdk.dev/jimage_objs/jimage.diz" ]; then
636 THIS_DIZ_FILE="$THIS/support/native/jdk.dev/jimage_objs/jimage.diz"
637 elif [ "$NAME" = "javacpl.exe" ] \
638 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
639 THIS_DIZ_FILE="$THIS/support/native/jdk.plugin/javacpl/javacpl.diz"
640 elif [ -f "${THIS_FILE_BASE}.diz" ]; then
641 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
642 else
643 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
644 if [ ! -f "$THIS_DIZ_FILE" ]; then
645 # As a last resort, look for diz file in the whole build output
646 # dir.
647 THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)"
648 fi
649 fi
650 if [ -n "$THIS_DIZ_FILE" ]; then
651 $MKDIR -p $FILE_WORK_DIR/this
652 (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE)
653 export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this"
654 fi
655 fi
656
657 if [ -z "$SKIP_BIN_DIFF" ]; then
658 if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
659 # The files were bytewise identical.
660 if [ -n "$VERBOSE" ]; then
661 echo " : : : : : : $BIN_FILE"
662 fi
663 return 0
664 fi
665 BIN_MSG=" diff "
666 if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
667 DIFF_BIN=true
668 if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then
669 BIN_MSG="*$BIN_MSG*"
670 REGRESSIONS=true
671 else
672 BIN_MSG=" $BIN_MSG "
673 fi
674 else
675 BIN_MSG="($BIN_MSG)"
676 DIFF_BIN=
677 fi
678 fi
679
680 if [ -n "$STAT" ]; then
681 THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE")
682 OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE")
683 else
684 THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }')
685 OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }')
686 fi
687 if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
688 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
689 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
690 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
691 if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \
692 && [ "$DIFF_SIZE_REL" -lt 102 ]; then
693 SIZE_MSG="($SIZE_MSG)"
694 DIFF_SIZE=
695 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
696 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
697 && [ "$DIFF_SIZE_NUM" = 512 ]; then
698 # On windows, size of binaries increase in 512 increments.
699 SIZE_MSG="($SIZE_MSG)"
700 DIFF_SIZE=
701 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
702 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
703 && [ "$DIFF_SIZE_NUM" = -512 ]; then
704 # On windows, size of binaries increase in 512 increments.
705 SIZE_MSG="($SIZE_MSG)"
706 DIFF_SIZE=
707 else
708 if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
709 DIFF_SIZE=true
710 if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
711 SIZE_MSG="*$SIZE_MSG*"
712 REGRESSIONS=true
713 else
714 SIZE_MSG=" $SIZE_MSG "
715 fi
716 else
717 SIZE_MSG="($SIZE_MSG)"
718 DIFF_SIZE=
719 fi
720 fi
721 else
722 SIZE_MSG=" "
723 DIFF_SIZE=
724 if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then
725 SIZE_MSG=" ! "
726 fi
727 fi
728
729 if [ "$SORT_ALL_SYMBOLS" = "true" ] || [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
730 SYM_SORT_CMD="sort"
731 else
732 SYM_SORT_CMD="cat"
733 fi
734
735 # Check symbols
736 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
737 # The output from dumpbin on windows differs depending on if the debug symbol
738 # files are still around at the location the binary is pointing too. Need
739 # to filter out that extra information.
740 $DUMPBIN -exports $OTHER_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
741 $DUMPBIN -exports $THIS_FILE | $GREP -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
742 elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
743 # Some symbols get seemingly random 15 character prefixes. Filter them out.
744 $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
745 $NM -a $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SED 's/^\([a-zA-Z] [\.\$]\)[a-zA-Z0-9_\$]\{15,15\}\./\1./g' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
746 elif [ "$OPENJDK_TARGET_OS" = "aix" ]; then
747 $OBJDUMP -T $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
748 $OBJDUMP -T $ORIG_THIS_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
749 else
750 $NM -a $ORIG_OTHER_FILE 2> /dev/null | $GREP -v $NAME | $AWK '{print $2, $3, $4, $5}' | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
751 $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
752 fi
753
754 LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
755 if [ -s $WORK_FILE_BASE.symbols.diff ]; then
756 SYM_MSG=" diff "
757 if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
758 DIFF_SYM=true
759 if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
760 SYM_MSG="*$SYM_MSG*"
761 REGRESSIONS=true
762 else
763 SYM_MSG=" $SYM_MSG "
764 fi
765 else
766 SYM_MSG="($SYM_MSG)"
767 DIFF_SYM=
768 fi
769 else
770 SYM_MSG=" "
771 DIFF_SYM=
772 if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then
773 SYM_MSG=" ! "
774 fi
775 fi
776
777 # Check dependencies
778 if [ -n "$LDD_CMD" ]; then
779 (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
780 (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)
781 (cd $FILE_WORK_DIR && $RM -f $NAME)
782
783 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
784 LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
785
786 if [ -s $WORK_FILE_BASE.deps.diff ]; then
787 if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
788 DEP_MSG=" diff "
789 else
790 DEP_MSG=" redun "
791 fi
792 if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then
793 DIFF_DEP=true
794 if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then
795 DEP_MSG="*$DEP_MSG*"
796 REGRESSIONS=true
797 else
798 DEP_MSG=" $DEP_MSG "
799 fi
800 else
801 DEP_MSG="($DEP_MSG)"
802 DIFF_DEP=
803 fi
804 else
805 DEP_MSG=" "
806 DIFF_DEP=
807 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
808 DEP_MSG=" ! "
809 fi
810 fi
811 else
812 DEP_MSG=" - "
813 fi
814
815 # Some linux compilers add a unique Build ID
816 if [ "$OPENJDK_TARGET_OS" = "linux" ]; then
817 BUILD_ID_FILTER="$SED -r 's/(Build ID:) [0-9a-f]{40}/\1/'"
818 else
819 BUILD_ID_FILTER="$CAT"
820 fi
821
822 # Compare fulldump output
823 if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
824 if [ -z "$FULLDUMP_DIFF_FILTER" ]; then
825 FULLDUMP_DIFF_FILTER="$CAT"
826 fi
827 $FULLDUMP_CMD $OTHER_FILE | eval "$BUILD_ID_FILTER" | eval "$FULLDUMP_DIFF_FILTER" \
828 > $WORK_FILE_BASE.fulldump.other 2>&1
829 $FULLDUMP_CMD $THIS_FILE | eval "$BUILD_ID_FILTER" | eval "$FULLDUMP_DIFF_FILTER" \
830 > $WORK_FILE_BASE.fulldump.this 2>&1
831
832 LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this \
833 > $WORK_FILE_BASE.fulldump.diff
834
835 if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
836 FULLDUMP_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
837 FULLDUMP_MSG=$($PRINTF "%8d" $FULLDUMP_DIFF_SIZE)
838 if [[ "$ACCEPTED_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
839 DIFF_FULLDUMP=true
840 if [[ "$KNOWN_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
841 FULLDUMP_MSG="*$FULLDUMP_MSG*"
842 REGRESSIONS=true
843 else
844 FULLDUMP_MSG=" $FULLDUMP_MSG "
845 fi
846 else
847 FULLDUMP_MSG="($FULLDUMP_MSG)"
848 DIFF_FULLDUMP=
849 fi
850 else
851 FULLDUMP_MSG=" "
852 DIFF_FULLDUMP=
853 if [[ "$KNOWN_FULLDUMP_DIFF $ACCEPTED_FULLDUMP_DIFF" = *"$BIN_FILE"* ]]; then
854 FULLDUMP_MSG=" ! "
855 fi
856 fi
857 fi
858
859 # Compare disassemble output
860 if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then
861 # By default we filter out differences that include references to symbols.
862 # To get a raw diff with the complete disassembly, set
863 # DIS_DIFF_FILTER="$CAT"
864 if [ -z "$DIS_DIFF_FILTER" ]; then
865 DIS_DIFF_FILTER="$GREP -v ' # .* <.*>$' | $SED -r -e 's/(\b|x)([0-9a-fA-F]+)(\b|:|>)/X/g'"
866 fi
867 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
868 DIS_GREP_ARG=-a
869 else
870 DIS_GREP_ARG=
871 fi
872 $DIS_CMD $OTHER_FILE | $GREP $DIS_GREP_ARG -v $NAME \
873 | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.other 2>&1
874 $DIS_CMD $THIS_FILE | $GREP $DIS_GREP_ARG -v $NAME \
875 | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.this 2>&1
876
877 LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
878
879 if [ -s $WORK_FILE_BASE.dis.diff ]; then
880 DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
881 DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
882 if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then
883 DIFF_DIS=true
884 if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then
885 DIS_MSG="*$DIS_MSG*"
886 REGRESSIONS=true
887 else
888 DIS_MSG=" $DIS_MSG "
889 fi
890 else
891 DIS_MSG="($DIS_MSG)"
892 DIFF_DIS=
893 fi
894 else
895 DIS_MSG=" "
896 DIFF_DIS=
897 if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
898 DIS_MSG=" ! "
899 fi
900 fi
901 fi
902
903
904 if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_FULLDUMP$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
905 if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
906 if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
907 if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
908 if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
909 if [ -n "$FULLDUMP_MSG" ]; then echo -n "$FULLDUMP_MSG:"; fi
910 if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
911 echo " $BIN_FILE"
912 if [ "$SHOW_DIFFS" = "true" ]; then
913 if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then
914 echo "Symbols diff:"
915 $CAT $WORK_FILE_BASE.symbols.diff
916 fi
917 if [ -s "$WORK_FILE_BASE.deps.diff" ]; then
918 echo "Deps diff:"
919 $CAT $WORK_FILE_BASE.deps.diff
920 fi
921 if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then
922 echo "Fulldump diff:"
923 $CAT $WORK_FILE_BASE.fulldump.diff
924 fi
925 if [ -s "$WORK_FILE_BASE.dis.diff" ]; then
926 echo "Disassembly diff:"
927 $CAT $WORK_FILE_BASE.dis.diff
928 fi
929 fi
930 return 1
931 fi
932 return 0
933 }
934
935 ################################################################################
936 # Print binary diff header
937
938 print_binary_diff_header() {
939 if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi
940 if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n " Size :"; fi
941 if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi
942 if [ -z "$SKIP_DEP_DIFF" ]; then echo -n " Deps :"; fi
943 if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi
944 if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass :"; fi
945 echo
946 }
947
948 ################################################################################
949 # Compare all libraries
950
951 compare_all_libs() {
952 THIS_DIR=$1
953 OTHER_DIR=$2
954 WORK_DIR=$3
955
956 LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' \
957 -o -name '*.dll' -o -name '*.obj' -o -name '*.o' -o -name '*.a' \
958 -o -name '*.cpl' \) | $SORT | $FILTER)
959
960 if [ -n "$LIBS" ]; then
961 echo Libraries...
962 print_binary_diff_header
963 for l in $LIBS; do
964 if [ -f "$OTHER_DIR/$l" ]; then
965 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l
966 if [ "$?" != "0" ]; then
967 return_value=1
968 fi
969 fi
970 done
971 fi
972
973 return $return_value
974 }
975
976 ################################################################################
977 # Compare all executables
978
979 compare_all_execs() {
980 THIS_DIR=$1
981 OTHER_DIR=$2
982 WORK_DIR=$3
983
984 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
985 EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER)
986 else
987 EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \
988 \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \
989 -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \
990 -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \
991 -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \
992 -o -name '*.xml' -o -name '*.html' -o -name '*.png' -o -name 'README' \
993 -o -name '*.zip' -o -name '*.jimage' -o -name '*.java' -o -name '*.mf' \
994 -o -name '*.jpg' -o -name '*.wsdl' -o -name '*.js' -o -name '*.sh' \
995 -o -name '*.bat' -o -name '*LICENSE' -o -name '*.d' -o -name '*store' \
996 -o -name 'blacklist' -o -name '*certs' -o -name '*.ttf' \
997 -o -name '*.jfc' -o -name '*.dat' -o -name 'release' -o -name '*.dir'\
998 -o -name '*.sym' -o -name '*.idl' -o -name '*.h' -o -name '*.access' \
999 -o -name '*.template' -o -name '*.policy' -o -name '*.security' \
1000 -o -name 'COPYRIGHT' -o -name '*.1' \
1001 -o -name 'classlist' \) | $SORT | $FILTER)
1002 fi
1003
1004 if [ -n "$EXECS" ]; then
1005 echo Executables...
1006 print_binary_diff_header
1007 for e in $EXECS; do
1008 if [ -f "$OTHER_DIR/$e" ]; then
1009 compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e
1010 if [ "$?" != "0" ]; then
1011 return_value=1
1012 fi
1013 fi
1014 done
1015 fi
1016
1017 return $return_value
1018 }
1019
1020 ################################################################################
1021 # Initiate configuration
1022
1023 COMPARE_ROOT=/tmp/cimages.$USER
1024 $MKDIR -p $COMPARE_ROOT
1025 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1026 if [ "$(uname -o)" = "Cygwin" ]; then
1027 COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
1028 fi
1029 fi
1030
1031 THIS="$SCRIPT_DIR"
1032 echo "$THIS"
1033 THIS_SCRIPT="$0"
1034
1035 if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
1036 echo "bash ./compare.sh [OPTIONS] [FILTER]"
1037 echo ""
1038 echo "-all Compare all files in all known ways"
1039 echo "-names Compare the file names and directory structure"
1040 echo "-perms Compare the permission bits on all files and directories"
1041 echo "-types Compare the output of the file command on all files"
1042 echo "-general Compare the files not convered by the specialized comparisons"
1043 echo "-zips Compare the contents of all zip files"
1044 echo "-jars Compare the contents of all jar files"
1045 echo "-libs Compare all native libraries"
1046 echo "-execs Compare all executables"
1047 echo "-v Verbose output, does not hide known differences"
1048 echo "-vv More verbose output, shows diff output of all comparisons"
1049 echo "-o [OTHER] Compare with build in other directory. Will default to the old build directory"
1050 echo ""
1051 echo "--sort-symbols Sort all symbols before comparing"
1052 echo "--strip Strip all binaries before comparing"
1053 echo ""
1054 echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs"
1055 echo "Example:"
1056 echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
1057 echo ""
1058 echo "-2zips <file1> <file2> Compare two zip files only"
1059 echo "-2bins <file1> <file2> Compare two binary files only"
1060 echo "-2dirs <dir1> <dir2> Compare two directories as if they were images"
1061 echo ""
1062 exit 10
1063 fi
1064
1065 CMP_NAMES=false
1066 CMP_PERMS=false
1067 CMP_TYPES=false
1068 CMP_GENERAL=false
1069 CMP_ZIPS=false
1070 CMP_JARS=false
1071 CMP_LIBS=false
1072 CMP_EXECS=false
1073
1074 while [ -n "$1" ]; do
1075 case "$1" in
1076 -v)
1077 VERBOSE=true
1078 ;;
1079 -vv)
1080 VERBOSE=true
1081 SHOW_DIFFS=true
1082 ;;
1083 -o)
1084 OTHER="$2"
1085 shift
1086 ;;
1087 -all)
1088 CMP_NAMES=true
1089 if [ "$OPENJDK_TARGET_OS" != "windows" ]; then
1090 CMP_PERMS=true
1091 fi
1092 CMP_TYPES=true
1093 CMP_GENERAL=true
1094 CMP_ZIPS=true
1095 CMP_JARS=true
1096 CMP_LIBS=true
1097 CMP_EXECS=true
1098 ;;
1099 -names)
1100 CMP_NAMES=true
1101 ;;
1102 -perms)
1103 CMP_PERMS=true
1104 ;;
1105 -types)
1106 CMP_TYPES=true
1107 ;;
1108 -general)
1109 CMP_GENERAL=true
1110 ;;
1111 -zips)
1112 CMP_ZIPS=true
1113 ;;
1114 -jars)
1115 CMP_JARS=true
1116 ;;
1117 -libs)
1118 CMP_LIBS=true
1119 ;;
1120 -execs)
1121 CMP_EXECS=true
1122 ;;
1123 -2dirs)
1124 THIS="$(cd "$2" > /dev/null && pwd )"
1125 OTHER="$(cd "$3" > /dev/null && pwd )"
1126 THIS_BASE_DIR="$THIS"
1127 OTHER_BASE_DIR="$OTHER"
1128 SKIP_DEFAULT=true
1129 shift
1130 shift
1131 ;;
1132 -2zips)
1133 CMP_2_ZIPS=true
1134 THIS_FILE=$2
1135 OTHER_FILE=$3
1136 shift
1137 shift
1138 ;;
1139 -2bins)
1140 CMP_2_BINS=true
1141 THIS_FILE=$2
1142 OTHER_FILE=$3
1143 shift
1144 shift
1145 ;;
1146 --sort-symbols)
1147 SORT_ALL_SYMBOLS=true
1148 ;;
1149 --strip)
1150 STRIP_ALL=true
1151 ;;
1152 *)
1153 CMP_NAMES=false
1154 CMP_PERMS=false
1155 CMP_TYPES=false
1156 CMP_ZIPS=true
1157 CMP_JARS=true
1158 CMP_LIBS=true
1159 CMP_EXECS=true
1160
1161 if [ -z "$FILTER" ]; then
1162 FILTER="$GREP"
1163 fi
1164 FILTER="$FILTER -e $1"
1165 ;;
1166 esac
1167 shift
1168 done
1169
1170 if [ "$CMP_2_ZIPS" = "true" ]; then
1171 THIS_DIR="$(dirname $THIS_FILE)"
1172 THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
1173 OTHER_DIR="$(dirname $OTHER_FILE)"
1174 OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"
1175 THIS_FILE_NAME="$(basename $THIS_FILE)"
1176 OTHER_FILE_NAME="$(basename $OTHER_FILE)"
1177 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
1178 compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME
1179 exit
1180 fi
1181
1182 if [ "$CMP_2_BINS" = "true" ]; then
1183 THIS_DIR="$(dirname $THIS_FILE)"
1184 THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
1185 OTHER_DIR="$(dirname $OTHER_FILE)"
1186 OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"
1187 THIS_FILE_NAME="$(basename $THIS_FILE)"
1188 OTHER_FILE_NAME="$(basename $OTHER_FILE)"
1189 echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
1190 compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME
1191 exit
1192 fi
1193
1194 if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
1195 CMP_NAMES=true
1196 CMP_PERMS=true
1197 CMP_TYPES=true
1198 CMP_GENERAL=true
1199 CMP_ZIPS=true
1200 CMP_JARS=true
1201 CMP_LIBS=true
1202 CMP_EXECS=true
1203 fi
1204
1205 if [ -z "$FILTER" ]; then
1206 FILTER="$CAT"
1207 fi
1208
1209 if [ "$SKIP_DEFAULT" != "true" ]; then
1210 if [ -z "$OTHER" ]; then
1211 echo "Nothing to compare to, set with -o"
1212 exit 1
1213 else
1214 if [ ! -d "$OTHER" ]; then
1215 echo "Other build directory does not exist:"
1216 echo "$OTHER"
1217 exit 1
1218 fi
1219 OTHER="$( cd "$OTHER" > /dev/null && pwd )"
1220 echo "Comparing to:"
1221 echo "$OTHER"
1222 echo
1223 fi
1224
1225
1226 # Find the common images to compare, prioritizing later build stages
1227 if [ -d "$THIS/install/jdk" ] && [ -d "$OTHER/install/jdk" ]; then
1228 THIS_JDK="$THIS/install/jdk"
1229 THIS_JRE="$THIS/install/jre"
1230 OTHER_JDK="$OTHER/install/jdk"
1231 OTHER_JRE="$OTHER/install/jre"
1232 echo "Selecting install images for compare"
1233 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
1234 THIS_JDK="$THIS/images/jdk"
1235 THIS_JRE="$THIS/images/jre"
1236 OTHER_JDK="$OTHER/deploy/images/jdk"
1237 OTHER_JRE="$OTHER/deploy/images/jre"
1238 echo "Selecting deploy images for compare"
1239 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
1240 THIS_JDK="$THIS/images/jdk"
1241 THIS_JRE="$THIS/images/jre"
1242 OTHER_JDK="$OTHER/images/jdk"
1243 OTHER_JRE="$OTHER/images/jre"
1244 echo "Selecting jdk images for compare"
1245 else
1246 echo "No common images found."
1247 exit 1
1248 fi
1249 echo " $THIS_JDK"
1250 echo " $OTHER_JDK"
1251
1252 if [ -d "$THIS/images/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \
1253 && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
1254 if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
1255 THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
1256 THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle"
1257 else
1258 THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
1259 THIS_JRE_BUNDLE="$THIS/images/jre-bundle"
1260 fi
1261 if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
1262 OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
1263 OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle"
1264 else
1265 OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
1266 OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
1267 fi
1268 echo "Also comparing jdk macosx bundles"
1269 echo " $THIS_JDK_BUNDLE"
1270 echo " $OTHER_JDK_BUNDLE"
1271 fi
1272
1273 if [ -d "$THIS/deploy/bundles" -o -d "$THIS/deploy/images/bundles" ] \
1274 && [ -d "$OTHER/deploy/bundles" -o -d "$OTHER/deploy/images/bundles" ]; then
1275 if [ -d "$THIS/deploy/images/bundles" ]; then
1276 THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/images/bundles"
1277 else
1278 THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/bundles"
1279 fi
1280 if [ -d "$OTHER/deploy/images/bundles" ]; then
1281 OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/images/bundles"
1282 else
1283 OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles"
1284 fi
1285 echo "Also comparing deploy javadoc bundles"
1286 fi
1287
1288 if [ -d "$THIS/images/JavaAppletPlugin.plugin" ] \
1289 && [ -d "$OTHER/images/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
1290 if [ -d "$THIS/images/JavaAppletPlugin.plugin" ]; then
1291 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/images/JavaAppletPlugin.plugin"
1292 else
1293 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin"
1294 fi
1295 if [ -d "$OTHER/images/JavaAppletPlugin.plugin" ]; then
1296 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/images/JavaAppletPlugin.plugin"
1297 else
1298 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
1299 fi
1300 echo "Also comparing deploy applet image"
1301 echo " $THIS_DEPLOY_APPLET_PLUGIN_DIR"
1302 echo " $OTHER_DEPLOY_APPLET_PLUGIN_DIR"
1303 fi
1304
1305 if [ -d "$THIS/install/sparkle/Sparkle.framework" ] \
1306 && [ -d "$OTHER/install/sparkle/Sparkle.framework" ]; then
1307 THIS_SPARKLE_DIR="$THIS/install/sparkle/Sparkle.framework"
1308 OTHER_SPARKLE_DIR="$OTHER/install/sparkle/Sparkle.framework"
1309 echo "Also comparing install sparkle framework"
1310 echo " $THIS_SPARKLE_DIR"
1311 echo " $OTHER_SPARKLE_DIR"
1312 fi
1313
1314 if [ -d "$OTHER/images" ]; then
1315 OTHER_SEC_DIR="$OTHER/images"
1316 else
1317 OTHER_SEC_DIR="$OTHER/tmp"
1318 fi
1319 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
1320 THIS_SEC_DIR="$THIS/images"
1321 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
1322 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1323 if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
1324 JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
1325 else
1326 JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
1327 fi
1328 OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
1329 OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
1330 THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
1331 THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
1332 fi
1333
1334 if [ -d "$THIS/images/docs" ] && [ -d "$OTHER/images/docs" ]; then
1335 THIS_DOCS="$THIS/images/docs"
1336 OTHER_DOCS="$OTHER/images/docs"
1337 echo "Also comparing docs"
1338 else
1339 echo "WARNING! Docs haven't been built and won't be compared."
1340 fi
1341 fi
1342
1343 ################################################################################
1344 # Do the work
1345
1346 if [ "$CMP_NAMES" = "true" ]; then
1347 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1348 echo -n "JDK "
1349 compare_dirs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1350 echo -n "JRE "
1351 compare_dirs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1352
1353 echo -n "JDK "
1354 compare_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1355 echo -n "JRE "
1356 compare_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1357 fi
1358 if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
1359 echo -n "JDK Bundle "
1360 compare_dirs $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
1361 echo -n "JRE Bundle "
1362 compare_dirs $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
1363
1364 echo -n "JDK Bundle "
1365 compare_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
1366 echo -n "JRE Bundle "
1367 compare_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
1368 fi
1369 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
1370 echo -n "Docs "
1371 compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
1372 echo -n "Docs "
1373 compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
1374 fi
1375 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1376 compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1377 compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1378 fi
1379 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1380 echo -n "JavaAppletPlugin "
1381 compare_dirs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1382 echo -n "JavaAppletPlugin "
1383 compare_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1384 fi
1385 if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
1386 echo -n "Sparkle.framework "
1387 compare_dirs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1388 echo -n "Sparkle.framework "
1389 compare_files $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1390 fi
1391 fi
1392
1393 if [ "$CMP_PERMS" = "true" ]; then
1394 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1395 echo -n "JDK "
1396 compare_permissions $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1397 echo -n "JRE "
1398 compare_permissions $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1399 fi
1400 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1401 compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1402 fi
1403 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1404 echo -n "JavaAppletPlugin "
1405 compare_permissions $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1406 fi
1407 if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
1408 echo -n "Sparkle.framework "
1409 compare_permissions $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1410 fi
1411 fi
1412
1413 if [ "$CMP_TYPES" = "true" ]; then
1414 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1415 echo -n "JDK "
1416 compare_file_types $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1417 echo -n "JRE "
1418 compare_file_types $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1419 fi
1420 if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
1421 echo -n "JDK Bundle "
1422 compare_file_types $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
1423 echo -n "JRE Bundle "
1424 compare_file_types $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
1425 fi
1426 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1427 compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1428 fi
1429 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1430 echo -n "JavaAppletPlugin "
1431 compare_file_types $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1432 fi
1433 if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
1434 echo -n "Sparkle.framework "
1435 compare_file_types $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1436 fi
1437 fi
1438
1439 if [ "$CMP_GENERAL" = "true" ]; then
1440 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1441 echo -n "JDK "
1442 compare_general_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1443 echo -n "JRE "
1444 compare_general_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1445 fi
1446 if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
1447 echo -n "JDK Bundle "
1448 compare_general_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
1449 echo -n "JRE Bundle "
1450 compare_general_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
1451 fi
1452 if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
1453 echo -n "Docs "
1454 compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
1455 fi
1456 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1457 compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1458 fi
1459 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1460 echo -n "JavaAppletPlugin "
1461 compare_general_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1462 fi
1463 if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
1464 echo -n "Sparkle.framework "
1465 compare_general_files $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1466 fi
1467 fi
1468
1469 if [ "$CMP_ZIPS" = "true" ]; then
1470 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1471 compare_all_zip_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1472 fi
1473 if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
1474 if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
1475 echo "sec-bin.zip..."
1476 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip
1477 fi
1478 fi
1479 if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then
1480 if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then
1481 echo "sec-windows-bin.zip..."
1482 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip
1483 fi
1484 fi
1485 if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then
1486 if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then
1487 echo "$JGSS_WINDOWS_BIN..."
1488 compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
1489 fi
1490 fi
1491 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1492 compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1493 fi
1494 if [ -n "$THIS_DEPLOY_BUNDLE_DIR" ] && [ -n "$OTHER_DEPLOY_BUNDLE_DIR" ]; then
1495 compare_all_zip_files $THIS_DEPLOY_BUNDLE_DIR $OTHER_DEPLOY_BUNDLE_DIR $COMPARE_ROOT/deploy-bundle
1496 fi
1497 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1498 compare_all_zip_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1499 fi
1500 fi
1501
1502 if [ "$CMP_JARS" = "true" ]; then
1503 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1504 compare_all_jar_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1505 fi
1506 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1507 compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1508 fi
1509 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1510 compare_all_jar_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1511 fi
1512 fi
1513
1514 if [ "$CMP_LIBS" = "true" ]; then
1515 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1516 echo -n "JDK "
1517 compare_all_libs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1518 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
1519 echo -n "JRE "
1520 compare_all_libs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1521 fi
1522 fi
1523 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1524 compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1525 fi
1526 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1527 echo -n "JavaAppletPlugin "
1528 compare_all_libs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1529 fi
1530 if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
1531 echo -n "Sparkle.framework "
1532 compare_all_libs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1533 fi
1534 fi
1535
1536 if [ "$CMP_EXECS" = "true" ]; then
1537 if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
1538 compare_all_execs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
1539 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
1540 echo -n "JRE "
1541 compare_all_execs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
1542 fi
1543 fi
1544 if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
1545 compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
1546 fi
1547 if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
1548 echo -n "JavaAppletPlugin "
1549 compare_all_execs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
1550 fi
1551 if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
1552 echo -n "Sparkle.framework "
1553 compare_all_execs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
1554 fi
1555 fi
1556
1557 echo
1558
1559 if [ -n "$REGRESSIONS" ]; then
1560 echo "REGRESSIONS FOUND!"
1561 echo
1562 exit 1
1563 else
1564 echo "No regressions found"
1565 echo
1566 exit 0
1567 fi