Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/bin/compare.sh	Fri Jan 04 17:08:33 2013 +0100
     1.2 +++ b/common/bin/compare.sh	Fri Jan 04 22:43:13 2013 +0100
     1.3 @@ -1166,14 +1166,25 @@
     1.4      echo "WARNING! Other build doesn't contain docs, skipping doc compare."
     1.5  fi
     1.6  
     1.7 -if [ -f "$OTHER/tmp/sec-bin.zip" ]; then
     1.8 -    OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
     1.9 -elif [ -f "$OTHER/images/sec-bin.zip" ]; then
    1.10 -    OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
    1.11 +if [ -d "$OTHER/images" ]; then
    1.12 +    OTHER_SEC_DIR="$OTHER/images"
    1.13  else
    1.14 -    echo "WARNING! No sec-bin.zip found in other."
    1.15 +    OTHER_SEC_DIR="$OTHER/tmp"
    1.16  fi
    1.17 -THIS_SEC_BIN="$THIS/images/sec-bin.zip"
    1.18 +OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
    1.19 +THIS_SEC_DIR="$THIS/images"
    1.20 +THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
    1.21 +if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
    1.22 +    if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
    1.23 +        JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
    1.24 +    else
    1.25 +        JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
    1.26 +    fi
    1.27 +    OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
    1.28 +    OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
    1.29 +    THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
    1.30 +    THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
    1.31 +fi
    1.32  
    1.33  ##########################################################################################
    1.34  # Do the work

     2.1 --- a/common/bin/compare_exceptions.sh.incl	Fri Jan 04 17:08:33 2013 +0100
     2.2 +++ b/common/bin/compare_exceptions.sh.incl	Fri Jan 04 22:43:13 2013 +0100
     2.3 @@ -807,6 +807,10 @@
     2.4  
     2.5  if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
     2.6  
     2.7 +ACCEPTED_JARZIP_CONTENTS="
     2.8 +/bin/w2k_lsa_auth.dll
     2.9 +"
    2.10 +
    2.11  # Probably should add all libs here
    2.12  ACCEPTED_SMALL_SIZE_DIFF="
    2.13  ./demo/jvmti/gctest/lib/gctest.dll