common/bin/compare.sh

*** 1,8 ****
  #!/bin/bash
  #
! # Copyright (c) 2012, 2015, 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.
--- 1,8 ----
  #!/bin/bash
  #
! # Copyright (c) 2012, 2016, 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.
*** 744,753 ****
--- 744,756 ----
          $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
          $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
      elif [ "$OPENJDK_TARGET_OS" = "aix" ]; then
          $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
          $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
+     elif [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
+         $NM -j $ORIG_OTHER_FILE 2> /dev/null | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
+         $NM -j $ORIG_THIS_FILE  2> /dev/null | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
      else
          $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
          $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
      fi
  
*** 1018,1035 ****
  }
  
  ################################################################################
  # Initiate configuration
  
- COMPARE_ROOT=/tmp/cimages.$USER
- $MKDIR -p $COMPARE_ROOT
- if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
-     if [ "$(uname -o)" = "Cygwin" ]; then
-         COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
-     fi
- fi
- 
  THIS="$SCRIPT_DIR"
  echo "$THIS"
  THIS_SCRIPT="$0"
  
  if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
--- 1021,1030 ----
*** 1048,1057 ****
--- 1043,1053 ----
      echo "-vv                 More verbose output, shows diff output of all comparisons"
      echo "-o [OTHER]          Compare with build in other directory. Will default to the old build directory"
      echo ""
      echo "--sort-symbols      Sort all symbols before comparing"
      echo "--strip             Strip all binaries before comparing"
+     echo "--clean             Clean all previous comparison results first"
      echo ""
      echo "[FILTER]            List filenames in the image to compare, works for jars, zips, libs and execs"
      echo "Example:"
      echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
      echo ""
*** 1147,1156 ****
--- 1143,1155 ----
              SORT_ALL_SYMBOLS=true
              ;;
          --strip)
              STRIP_ALL=true
              ;;
+         --clean)
+             CLEAN_OUTPUT=true
+             ;;
          *)
              CMP_NAMES=false
              CMP_PERMS=false
              CMP_TYPES=false
              CMP_ZIPS=true
*** 1165,1174 ****
--- 1164,1190 ----
              ;;
      esac
      shift
  done
  
+ if [ "$STRIP_ALL" = "true" ] && [ -z "$STRIP" ]; then
+   echo Warning: Not stripping even with --strip, since strip is missing on this platform
+   STRIP_ALL=false
+ fi
+ 
+ COMPARE_ROOT=/tmp/cimages.$USER
+ if [ "$CLEAN_OUTPUT" = "true" ]; then
+     echo Cleaning old output in $COMPARE_ROOT.
+     $RM -rf $COMPARE_ROOT
+ fi
+ $MKDIR -p $COMPARE_ROOT
+ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
+     if [ "$(uname -o)" = "Cygwin" ]; then
+         COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
+     fi
+ fi
+ 
  if [ "$CMP_2_ZIPS" = "true" ]; then
      THIS_DIR="$(dirname $THIS_FILE)"
      THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
      OTHER_DIR="$(dirname $OTHER_FILE)"
      OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"