jdk8-mips64-public: comparison common/bin/compare.sh

-:4090847a5444
+:dc84b505b408
 #!/bin/bash
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
 # consequtive invokations seemingly randomly.
 # For example a method parameter randomly named "thePoint" or "aPoint". Ignore this.
 if test "x$SUFFIX" = "xclass"; then
 # To improve performance when large diffs are found, do a rough filtering of classes
 # elibeble for these exceptions
-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
+if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \
+	        -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \
+	        -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then
 $JAVAP -c -constants -l -p ${OTHER_FILE} >  ${OTHER_FILE}.javap
 $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap
 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
 $GREP '^[<>]' | \
 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
+		     -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \
 	             -e '/[<>].*Point   Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \
 	             -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \
 	             -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d')
 fi
 fi
 if test "x$SUFFIX" = "xproperties"; then
-$CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
+# Run through nawk to add possibly missing newline at end of file.
-| $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
+$CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned
-	    | $SED -e '/^#/d' -e '/^$/d' \
+# Disable this exception since we aren't changing the properties cleaning method yet.
--e :a -e '/\\$/N; s/\\\n//; ta' \
+#        $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
-	    -e 's/^[ \t]*//;s/[ \t]*$//' \
+#            | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \
-	    -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
+#  	    | $SED -e '/^#/d' -e '/^$/d' \
+#            -e :a -e '/\\$/N; s/\\\n//; ta' \
+#  	    -e 's/^[ \t]*//;s/[ \t]*$//' \
+#	    -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned
 TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE)
 fi
 if test -n "$TMP"; then
 echo Files $OTHER_FILE and $THIS_FILE differ
 return 1
 # Ignore time stamps in docs files
 OTHER_FILE=$WORK_DIR/$f.other
 THIS_FILE=$WORK_DIR/$f.this
 $MKDIR -p $(dirname $OTHER_FILE)
 $MKDIR -p $(dirname $THIS_FILE)
+#Note that | doesn't work on mac sed.
 $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
--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)/' \
+-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)/' \
+-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)/' \
 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
 > $OTHER_FILE
 $CAT $THIS_DIR/$f  | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \
--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)/' \
+-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)/' \
+-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)/' \
 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \
 > $THIS_FILE
 else
 OTHER_FILE=$OTHER_DIR/$f
 THIS_FILE=$THIS_DIR/$f
 $MKDIR -p $OTHER_UNZIPDIR
 (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
 # Find all archives inside and unzip them as well to compare the contents rather than
-# the archives.
+# the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
-EXCEPTIONS=""
+EXCEPTIONS="pie.jar.pack.gz"
-for pack in $($FIND $THIS_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do
+for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
 ($UNPACK200 $pack $pack.jar)
 # Filter out the unzipped archives from the diff below.
 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
 done
-for pack in $($FIND $OTHER_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do
+for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
 ($UNPACK200 $pack $pack.jar)
 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
 done
 for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
 $MKDIR $zip.unzip
 echo
 fi
 # Figure out the layout of the this build. Which kinds of images have been produced
-if [ -d "$THIS/deploy/j2sdk-image" ]; then
+if [ -d "$THIS/install/j2sdk-image" ]; then
+THIS_J2SDK="$THIS/install/j2sdk-image"
+THIS_J2RE="$THIS/install/j2re-image"
+echo "Comparing install images"
+elif [ -d "$THIS/deploy/j2sdk-image" ]; then
 THIS_J2SDK="$THIS/deploy/j2sdk-image"
 THIS_J2RE="$THIS/deploy/j2re-image"
 echo "Comparing deploy images"
 elif [ -d "$THIS/images/j2sdk-image" ]; then
 THIS_J2SDK="$THIS/images/j2sdk-image"
 THIS_J2RE="$THIS/images/j2re-image"
 fi
 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
-THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
+if [ -d "$THIS/install/j2sdk-image" ]; then
-THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+# If there is an install image, prefer that, it's also overlay
+THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
+THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+else
+THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
+THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+fi
 fi
 if [ -d "$THIS/images/j2sdk-bundle" ]; then
 THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
 THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
 OTHER_J2RE="$OTHER/j2re-image"
 else
 OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
 OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
 fi
+elif [ -d "$OTHER/images/j2sdk-image" ]; then
+OTHER_J2SDK="$OTHER/images/j2sdk-image"
+OTHER_J2RE="$OTHER/images/j2re-image"
 fi
 if [ -d "$OTHER/j2sdk-bundle" ]; then
 OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
 OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
 echo "WARNING! Docs haven't been built and won't be compared."
 fi
 if [ -z "$OTHER_DOCS" ]; then
 echo "WARNING! Other build doesn't contain docs, skipping doc compare."
+fi
+if [ -d "$OTHER/images" ]; then
+OTHER_SEC_DIR="$OTHER/images"
+else
+OTHER_SEC_DIR="$OTHER/tmp"
+fi
+OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
+THIS_SEC_DIR="$THIS/images"
+THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
+if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
+JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
+else
+JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
+fi
+OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
+OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
+THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
+THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
 fi
 ##########################################################################################
 # Do the work
 if [ "$CMP_ZIPS" = "true" ]; then
 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
 fi
+if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
+if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
+echo "sec-bin.zip..."
+compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip
+fi
+fi
+if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then
+if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then
+echo "sec-windows-bin.zip..."
+compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip
+fi
+fi
+if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then
+if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then
+echo "$JGSS_WINDOWS_BIN..."
+compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
+fi
+fi
 fi
 if [ "$CMP_JARS" = "true" ]; then
 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
 compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk

Mercurial > jdk8-mips64-public / file comparison

comparison: common/bin/compare.sh

common/bin/compare.sh