1.1 --- a/common/bin/compare.sh Wed Jan 02 15:36:00 2013 +0100
1.2 +++ b/common/bin/compare.sh Thu Jan 03 20:54:38 2013 +0100
1.3 @@ -98,12 +98,15 @@
1.4 if test "x$SUFFIX" = "xclass"; then
1.5 # To improve performance when large diffs are found, do a rough filtering of classes
1.6 # elibeble for these exceptions
1.7 - if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
1.8 + if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
1.9 + -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
1.10 + -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
1.11 $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap
1.12 $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
1.13 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
1.14 $GREP '^[<>]' | \
1.15 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
1.16 + -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
1.17 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
1.18 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
1.19 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
1.20 @@ -305,14 +308,17 @@
1.21 THIS_FILE=$WORK_DIR/$f.this
1.22 $MKDIR -p $(dirname $OTHER_FILE)
1.23 $MKDIR -p $(dirname $THIS_FILE)
1.24 + #Note that | doesn't work on mac sed.
1.25 $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
1.26 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
1.27 - -e 's/\(Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\), [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* \(AM\|PM\) [A-Z][A-Z]*/(removed)/' \
1.28 + -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)/' \
1.29 + -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)/' \
1.30 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
1.31 > $OTHER_FILE
1.32 $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
1.33 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
1.34 - -e 's/\(Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\), [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* \(AM\|PM\) [A-Z][A-Z]*/(removed)/' \
1.35 + -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)/' \
1.36 + -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)/' \
1.37 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
1.38 > $THIS_FILE
1.39 else
1.40 @@ -370,14 +376,14 @@
1.41 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
1.42
1.43 # Find all archives inside and unzip them as well to compare the contents rather than
1.44 - # the archives.
1.45 - EXCEPTIONS=""
1.46 - for pack in $($FIND $THIS_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do
1.47 + # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
1.48 + EXCEPTIONS="pie.jar.pack.gz"
1.49 + for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
1.50 ($UNPACK200 $pack $pack.jar)
1.51 # Filter out the unzipped archives from the diff below.
1.52 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
1.53 done
1.54 - for pack in $($FIND $OTHER_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do
1.55 + for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
1.56 ($UNPACK200 $pack $pack.jar)
1.57 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
1.58 done
1.59 @@ -1073,7 +1079,11 @@
1.60
1.61
1.62 # Figure out the layout of the this build. Which kinds of images have been produced
1.63 -if [ -d "$THIS/deploy/j2sdk-image" ]; then
1.64 +if [ -d "$THIS/install/j2sdk-image" ]; then
1.65 + THIS_J2SDK="$THIS/install/j2sdk-image"
1.66 + THIS_J2RE="$THIS/install/j2re-image"
1.67 + echo "Comparing install images"
1.68 +elif [ -d "$THIS/deploy/j2sdk-image" ]; then
1.69 THIS_J2SDK="$THIS/deploy/j2sdk-image"
1.70 THIS_J2RE="$THIS/deploy/j2re-image"
1.71 echo "Comparing deploy images"
1.72 @@ -1081,9 +1091,16 @@
1.73 THIS_J2SDK="$THIS/images/j2sdk-image"
1.74 THIS_J2RE="$THIS/images/j2re-image"
1.75 fi
1.76 +
1.77 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
1.78 - THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
1.79 - THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
1.80 + if [ -d "$THIS/install/j2sdk-image" ]; then
1.81 + # If there is an install image, prefer that, it's also overlay
1.82 + THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
1.83 + THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
1.84 + else
1.85 + THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
1.86 + THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
1.87 + fi
1.88 fi
1.89
1.90 if [ -d "$THIS/images/j2sdk-bundle" ]; then
1.91 @@ -1100,7 +1117,9 @@
1.92 OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
1.93 OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
1.94 fi
1.95 -
1.96 +elif [ -d "$OTHER/images/j2sdk-image" ]; then
1.97 + OTHER_J2SDK="$OTHER/images/j2sdk-image"
1.98 + OTHER_J2RE="$OTHER/images/j2re-image"
1.99 fi
1.100
1.101 if [ -d "$OTHER/j2sdk-bundle" ]; then
