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