Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/bin/compare.sh	Tue Nov 13 15:54:33 2012 -0800
     1.2 +++ b/common/bin/compare.sh	Wed Nov 14 10:05:49 2012 -0800
     1.3 @@ -283,7 +283,7 @@
     1.4          ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
     1.5          ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
     1.6          ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
     1.7 -        ! -name "*.lib" ! -name "*.war" \
     1.8 +        ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \
     1.9          | $GREP -v "./bin/"  | $SORT | $FILTER)
    1.10  
    1.11      echo General files...
    1.12 @@ -611,10 +611,19 @@
    1.13          DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
    1.14          DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
    1.15          SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
    1.16 -        if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] && [ "$DIFF_SIZE_REL" -lt 102 ]; then
    1.17 +        if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \
    1.18 +	    && [ "$DIFF_SIZE_REL" -lt 102 ]; then
    1.19              SIZE_MSG="($SIZE_MSG)"
    1.20              DIFF_SIZE=
    1.21 -        elif [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_NUM" = 512 ]; then
    1.22 +        elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
    1.23 +	    && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
    1.24 +	    && [ "$DIFF_SIZE_NUM" = 512 ]; then
    1.25 +	    # On windows, size of binaries increase in 512 increments.
    1.26 +            SIZE_MSG="($SIZE_MSG)"
    1.27 +            DIFF_SIZE=
    1.28 +        elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
    1.29 +	    && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
    1.30 +	    && [ "$DIFF_SIZE_NUM" = -512 ]; then
    1.31  	    # On windows, size of binaries increase in 512 increments.
    1.32              SIZE_MSG="($SIZE_MSG)"
    1.33              DIFF_SIZE=
    1.34 @@ -840,7 +849,7 @@
    1.35      OTHER_DIR=$2
    1.36      WORK_DIR=$3
    1.37  
    1.38 -    LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' \) | $SORT | $FILTER)
    1.39 +    LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' -o -name 'JavaControlPanel' \) | $SORT | $FILTER)
    1.40  
    1.41      if [ -n "$LIBS" ]; then
    1.42          echo Libraries...
    1.43 @@ -1218,7 +1227,12 @@
    1.44  
    1.45  if [ "$CMP_LIBS" = "true" ]; then
    1.46      if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
    1.47 +        echo -n "J2SDK "
    1.48          compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
    1.49 +        if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
    1.50 +            echo -n "J2RE  "
    1.51 +            compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
    1.52 +        fi
    1.53      fi
    1.54      if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
    1.55          echo -n "Bundle   "

     2.1 --- a/common/bin/compare_exceptions.sh.incl	Tue Nov 13 15:54:33 2012 -0800
     2.2 +++ b/common/bin/compare_exceptions.sh.incl	Wed Nov 14 10:05:49 2012 -0800
     2.3 @@ -881,6 +881,7 @@
     2.4  
     2.5  KNOWN_BIN_DIFF="
     2.6  ./jre/lib/libJObjC.dylib
     2.7 +./lib/libJObjC.dylib
     2.8  "
     2.9  
    2.10  ACCEPTED_BIN_DIFF="
    2.11 @@ -932,26 +933,34 @@
    2.12  ./jre/bin/tnameserv
    2.13  ./jre/lib/libsaproc.dylib
    2.14  ./jre/lib/server/libjvm.dylib
    2.15 +./lib/libsaproc.dylib
    2.16 +./lib/server/libjvm.dylib
    2.17 +./lib/deploy/JavaControlPanel.prefPane/Contents/MacOS/JavaControlPanel
    2.18  "
    2.19  
    2.20  KNOWN_SIZE_DIFF="
    2.21  ./jre/lib/libJObjC.dylib
    2.22 +./lib/libJObjC.dylib
    2.23  "
    2.24  
    2.25  SORT_SYMBOLS="
    2.26  ./jre/lib/libJObjC.dylib
    2.27 +./lib/libJObjC.dylib
    2.28  "
    2.29  
    2.30  KNOWN_SYM_DIFF="
    2.31  ./jre/lib/libJObjC.dylib
    2.32 +./lib/libJObjC.dylib
    2.33  "
    2.34  
    2.35  KNOWN_ELF_DIFF="
    2.36  ./jre/lib/libJObjC.dylib
    2.37 +./lib/libJObjC.dylib
    2.38  "
    2.39  
    2.40  KNOWN_DIS_DIFF="
    2.41  ./jre/lib/libJObjC.dylib
    2.42 +./lib/libJObjC.dylib
    2.43  "
    2.44  
    2.45  fi