common/bin/compare.sh
author aeriksso
Thu, 03 Mar 2016 12:36:54 +0100
changeset 36401 fb588215d43d
parent 35747 aeaa6d0101a8
child 36506 17612cee3530
permissions -rw-r--r--
8150986: serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java failing because expects HPROF JAVA PROFILE 1.0.1 file format Reviewed-by: dcubed, dsamersoff
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     1
#!/bin/bash
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     2
#
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
     3
# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     4
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     5
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     6
# This code is free software; you can redistribute it and/or modify it
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     7
# under the terms of the GNU General Public License version 2 only, as
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     8
# published by the Free Software Foundation.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
     9
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    10
# This code is distributed in the hope that it will be useful, but WITHOUT
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    11
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    12
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    13
# version 2 for more details (a copy is included in the LICENSE file that
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    14
# accompanied this code).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    15
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    16
# You should have received a copy of the GNU General Public License version
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    17
# 2 along with this work; if not, write to the Free Software Foundation,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    18
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    19
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    20
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    21
# or visit www.oracle.com if you need additional information or have any
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    22
# questions.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    23
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    24
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
    25
# This script is processed by configure before it's usable. It is run from
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    26
# the root of the build directory.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    27
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    28
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
    29
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    30
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    31
# Check that we are run via the wrapper generated by configure
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    32
if [ -z "$SRC_ROOT" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    33
    echo "Error: You must run this script using build/[conf]/compare.sh"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    34
    exit 1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    35
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    36
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    37
if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
    38
    FULLDUMP_CMD="$OTOOL -v -V -h -X -d"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    39
    LDD_CMD="$OTOOL -L"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
    40
    DIS_CMD="$OTOOL -v -V -t"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    41
    STAT_PRINT_SIZE="-f %z"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    42
elif [ "$OPENJDK_TARGET_OS" = "windows" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    43
    FULLDUMP_CMD="$DUMPBIN -all"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    44
    LDD_CMD="$DUMPBIN -dependants | $GREP .dll"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    45
    DIS_CMD="$DUMPBIN -disasm:nobytes"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    46
    STAT_PRINT_SIZE="-c %s"
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
    47
elif [ "$OPENJDK_TARGET_OS" = "aix" ]; then
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
    48
    FULLDUMP_CMD="dump -h -r -t -n -X64"
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
    49
    LDD_CMD="$LDD"
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
    50
    DIS_CMD="$OBJDUMP -d"
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
    51
    STAT_PRINT_SIZE="-c %s"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    52
else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    53
    FULLDUMP_CMD="$READELF -a"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    54
    LDD_CMD="$LDD"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    55
    DIS_CMD="$OBJDUMP -d"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    56
    STAT_PRINT_SIZE="-c %s"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    57
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    58
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    59
COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    60
if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    61
    echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    62
    exit 1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    63
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    64
# Include exception definitions
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    65
. "$COMPARE_EXCEPTIONS_INCLUDE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    66
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
    67
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    68
# Compare text files and ignore specific differences:
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    69
#
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    70
#  * Timestamps in Java sources generated by idl2java
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    71
#  * Sorting order and cleanup style in .properties files
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    72
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    73
diff_text() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    74
    OTHER_FILE=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    75
    THIS_FILE=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    76
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    77
    SUFFIX="${THIS_FILE##*.}"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    78
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    79
    TMP=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    80
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    81
    if [[ "$THIS_FILE" = *"META-INF/MANIFEST.MF" ]]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
    82
        # Filter out date string, ant version and java version differences.
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
    83
        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    84
            $GREP '^[<>]' | \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    85
            $SED -e '/[<>] Ant-Version: Apache Ant .*/d' \
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
    86
                 -e '/[<>] Created-By: .* (Oracle [Corpatin)]*/d' \
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
    87
                 -e '/[<>]  [Corpatin]*)/d' \
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
    88
                 -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d')
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    89
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    90
    if test "x$SUFFIX" = "xjava"; then
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
    91
        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    92
            $GREP '^[<>]' | \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    93
            $SED -e '/[<>] \* from.*\.idl/d' \
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
    94
                 -e '/[<>] .*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    95
                 -e '/[<>] \*.*[0-9]\{4\} [0-9][0-9]*:[0-9]\{2\}:[0-9]\{2\}.*/d' \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    96
                 -e '/\/\/ Generated from input file.*/d' \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    97
                 -e '/\/\/ This file was generated AUTOMATICALLY from a template file.*/d' \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    98
                 -e '/\/\/ java GenerateCharacter.*/d')
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
    99
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   100
    # Ignore date strings in class files.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   101
    # Anonymous lambda classes get randomly assigned counters in their names.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   102
    if test "x$SUFFIX" = "xclass"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   103
        # To improve performance when large diffs are found, do a rough filtering of classes
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   104
        # elibeble for these exceptions
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   105
        if $GREP -R -e '[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}' \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   106
                -e 'lambda\$[a-zA-Z0-9]*\$[0-9]' ${THIS_FILE} > /dev/null; then
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   107
            $JAVAP -c -constants -l -p "${OTHER_FILE}" >  ${OTHER_FILE}.javap
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   108
            $JAVAP -c -constants -l -p "${THIS_FILE}" > ${THIS_FILE}.javap
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   109
            TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   110
                $GREP '^[<>]' | \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   111
                $SED -e '/[<>].*[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.*/d' \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   112
                     -e '/[<>].*lambda\$[a-zA-Z0-9]*\$[0-9]*/d')
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   113
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   114
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   115
    if test "x$SUFFIX" = "xproperties"; then
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   116
        # Filter out date string differences.
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   117
        TMP=$(LC_ALL=C $DIFF $OTHER_FILE $THIS_FILE | \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   118
            $GREP '^[<>]' | \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   119
            $SED -e '/[<>].*[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.*/d')
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   120
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   121
    if test "x$SUFFIX" = "xhtml"; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   122
	# Some javadoc versions do not put quotes around font size
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   123
	HTML_FILTER="$SED \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   124
            -e 's/<font size=-1>/<font size=\"-1\">/g'"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   125
	$CAT $THIS_FILE | eval "$HTML_FILTER" > $THIS_FILE.filtered
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   126
	$CAT $OTHER_FILE | eval "$HTML_FILTER" > $OTHER_FILE.filtered
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   127
        TMP=$(LC_ALL=C $DIFF $OTHER_FILE.filtered $THIS_FILE.filtered | \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   128
            $GREP '^[<>]' | \
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   129
            $SED -e '/[<>] <!-- Generated by javadoc .* on .* -->/d' \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   130
	         -e '/[<>] <meta name="date" content=".*">/d' )
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   131
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   132
    if test -n "$TMP"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   133
        echo Files $OTHER_FILE and $THIS_FILE differ
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   134
        return 1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   135
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   136
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   137
    return 0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   138
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   139
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   140
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   141
# Compare directory structure
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   142
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   143
compare_dirs() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   144
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   145
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   146
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   147
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   148
    mkdir -p $WORK_DIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   149
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   150
    (cd $OTHER_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_other)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   151
    (cd $THIS_DIR && $FIND . -type d | $SORT > $WORK_DIR/dirs_this)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   152
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   153
    $DIFF $WORK_DIR/dirs_other $WORK_DIR/dirs_this > $WORK_DIR/dirs_diff
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   154
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   155
    echo -n Directory structure...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   156
    if [ -s $WORK_DIR/dirs_diff ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   157
        echo Differences found.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   158
        REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   159
        # Differences in directories found.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   160
        ONLY_OTHER=$($GREP '<' $WORK_DIR/dirs_diff)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   161
        if [ "$ONLY_OTHER" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   162
            echo Only in $OTHER
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   163
            $GREP '<' $WORK_DIR/dirs_diff | $SED 's|< ./|    |g'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   164
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   165
        ONLY_THIS=$($GREP '>' $WORK_DIR/dirs_diff)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   166
        if [ "$ONLY_THIS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   167
            echo Only in $THIS
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   168
            $GREP '>' $WORK_DIR/dirs_diff | $SED 's|> ./|    |g'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   169
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   170
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   171
        echo Identical!
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   172
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   173
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   174
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   175
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   176
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   177
# Compare file structure
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   178
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   179
compare_files() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   180
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   181
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   182
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   183
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   184
    $MKDIR -p $WORK_DIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   185
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   186
    (cd $OTHER_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_other)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   187
    (cd $THIS_DIR && $FIND . ! -type d | $SORT > $WORK_DIR/files_this)
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   188
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   189
    $DIFF $WORK_DIR/files_other $WORK_DIR/files_this > $WORK_DIR/files_diff
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   190
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   191
    echo -n File names...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   192
    if [ -s $WORK_DIR/files_diff ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   193
        echo Differences found.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   194
        REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   195
        # Differences in files found.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   196
        ONLY_OTHER=$($GREP '<' $WORK_DIR/files_diff)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   197
        if [ "$ONLY_OTHER" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   198
            echo Only in $OTHER
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   199
            $GREP '<' $WORK_DIR/files_diff | $SED 's|< ./|    |g'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   200
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   201
        ONLY_THIS=$($GREP '>' $WORK_DIR/files_diff)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   202
        if [ "$ONLY_THIS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   203
            echo Only in $THIS
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   204
            $GREP '>' $WORK_DIR/files_diff | $SED 's|> ./|    |g'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   205
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   206
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   207
        echo Identical!
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   208
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   209
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   210
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   211
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   212
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   213
# Compare permissions
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   214
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   215
compare_permissions() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   216
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   217
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   218
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   219
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   220
    mkdir -p $WORK_DIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   221
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   222
    echo -n Permissions...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   223
    found=""
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   224
    for f in `cd $OTHER_DIR && $FIND . -type f`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   225
    do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   226
        if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   227
        if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   228
        OP=`ls -l ${OTHER_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   229
        TP=`ls -l ${THIS_DIR}/$f | awk '{printf("%.10s\n", $1);}'`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   230
        if [ "$OP" != "$TP" ]
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   231
        then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   232
            if [ -z "$found" ]; then echo ; found="yes"; fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   233
            $PRINTF "\tother: ${OP} this: ${TP}\t$f\n"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   234
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   235
    done
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   236
    if [ -z "$found" ]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   237
        echo "Identical!"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   238
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   239
        REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   240
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   241
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   242
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   243
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   244
# Compare file command output
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   245
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   246
compare_file_types() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   247
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   248
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   249
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   250
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   251
    $MKDIR -p $WORK_DIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   252
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   253
    echo -n File types...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   254
    found=""
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   255
    for f in `cd $OTHER_DIR && $FIND . ! -type d`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   256
    do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   257
        if [ ! -f ${OTHER_DIR}/$f ]; then continue; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   258
        if [ ! -f ${THIS_DIR}/$f ]; then continue; fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   259
        OF=`cd ${OTHER_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   260
        TF=`cd ${THIS_DIR} && $FILE -h $f | $SED 's/BuildID[^,]*//g'`
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   261
        if [ "$OF" != "$TF" ]
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   262
        then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   263
            if [ "`echo $OF | $GREP -c 'Zip archive data'`" -gt 0 ] \
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   264
                && [ "`echo $TF | $GREP -c 'Zip archive data'`" -gt 0 ]
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   265
            then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   266
                # the way we produce zip-files make it so that directories are stored in
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   267
                # old file but not in new (only files with full-path) this makes file
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   268
                # report them as different
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   269
                continue
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   270
            else
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   271
                if [ -z "$found" ]; then echo ; found="yes"; fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   272
                $PRINTF "\tother: ${OF}\n\tthis : ${TF}\n"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   273
            fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   274
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   275
    done
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   276
    if [ -z "$found" ]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   277
        echo "Identical!"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   278
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   279
        REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   280
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   281
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   282
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   283
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   284
# Compare the rest of the files
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   285
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   286
compare_general_files() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   287
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   288
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   289
    WORK_DIR=$3
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   290
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   291
    GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   292
        ! -name "*.zip" ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   293
        ! -name "*.jimage" ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   294
        ! -name "*.cpl" ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
14458
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
   295
        ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   296
        ! -name "*.obj" ! -name "*.o" ! -name "JavaControlPanelHelper" \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   297
        ! -name "JavaUpdater" ! -name "JavaWSApplicationStub" \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   298
        ! -name "jspawnhelper" ! -name "JavawsLauncher" ! -name "*.a" \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   299
        ! -name "finish_installation" ! -name "Sparkle" \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   300
        | $GREP -v "./bin/"  | $SORT | $FILTER)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   301
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   302
    echo Other files with binary differences...
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   303
    for f in $GENERAL_FILES
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   304
    do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   305
        if [ -e $OTHER_DIR/$f ]; then
14466
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
   306
            SUFFIX="${f##*.}"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   307
            if [ "$(basename $f)" = "release" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   308
                # Ignore differences in change numbers in release file.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   309
                OTHER_FILE=$WORK_DIR/$f.other
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   310
                THIS_FILE=$WORK_DIR/$f.this
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   311
                $MKDIR -p $(dirname $OTHER_FILE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   312
                $MKDIR -p $(dirname $THIS_FILE)
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   313
                RELEASE_FILTER="$SED \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   314
                    -e 's/\:[0-9a-f]\{12,12\}/:CHANGE/g' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   315
                    -e 's/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g'
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   316
                    "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   317
                $CAT $OTHER_DIR/$f | eval "$RELEASE_FILTER" > $OTHER_FILE
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   318
                $CAT $THIS_DIR/$f  | eval "$RELEASE_FILTER" > $THIS_FILE
14466
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
   319
            elif [ "x$SUFFIX" = "xhtml" ]; then
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
   320
                # Ignore time stamps in docs files
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
   321
                OTHER_FILE=$WORK_DIR/$f.other
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
   322
                THIS_FILE=$WORK_DIR/$f.this
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   323
                $MKDIR -p $(dirname $OTHER_FILE) $(dirname $THIS_FILE)
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   324
                # Older versions of compare might have left soft links with
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   325
                # these names.
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   326
                $RM $OTHER_FILE $THIS_FILE
15058
61c4ac49cbda 8005635: build-infra: Support building install in jprt
erikj
parents: 14466
diff changeset
   327
                #Note that | doesn't work on mac sed.
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   328
                HTML_FILTER="$SED \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   329
                    -e 's/[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   330
                    -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   331
                    -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [0-9]\{4\} [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/<DATE>/'
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   332
                    "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   333
                $CAT $OTHER_DIR/$f | eval "$HTML_FILTER" > $OTHER_FILE
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   334
                $CAT $THIS_DIR/$f  | eval "$HTML_FILTER" > $THIS_FILE
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   335
            else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   336
                OTHER_FILE=$OTHER_DIR/$f
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   337
                THIS_FILE=$THIS_DIR/$f
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   338
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   339
            DIFF_OUT=$($DIFF $OTHER_FILE $THIS_FILE 2>&1)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   340
            if [ -n "$DIFF_OUT" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   341
                echo $f
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   342
                REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   343
                if [ "$SHOW_DIFFS" = "true" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   344
                    echo "$DIFF_OUT"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   345
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   346
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   347
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   348
    done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   349
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   350
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   351
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   352
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   353
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   354
# Compare zip file
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   355
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   356
compare_zip_file() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   357
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   358
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   359
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   360
    ZIP_FILE=$4
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   361
    # Optionally provide different name for other zipfile
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   362
    OTHER_ZIP_FILE=$5
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   363
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   364
    THIS_ZIP=$THIS_DIR/$ZIP_FILE
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   365
    if [ -n "$OTHER_ZIP_FILE" ]; then
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   366
        OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   367
    else
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   368
        OTHER_ZIP=$OTHER_DIR/$ZIP_FILE
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
   369
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   370
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   371
    THIS_SUFFIX="${THIS_ZIP##*.}"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   372
    OTHER_SUFFIX="${OTHER_ZIP##*.}"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   373
    if [ "$THIS_SUFFIX" != "$OTHER_SUFFIX" ]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   374
        echo "The files do not have the same suffix type! ($THIS_SUFFIX != $OTHER_SUFFIX)"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   375
        return 2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   376
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   377
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   378
    TYPE="$THIS_SUFFIX"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   379
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   380
    if $CMP $OTHER_ZIP $THIS_ZIP > /dev/null
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   381
    then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   382
        return 0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   383
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   384
    # Not quite identical, the might still contain the same data.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   385
    # Unpack the jar/zip files in temp dirs
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   386
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   387
    THIS_UNZIPDIR=$WORK_DIR/$ZIP_FILE.this
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   388
    OTHER_UNZIPDIR=$WORK_DIR/$ZIP_FILE.other
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   389
    $RM -rf $THIS_UNZIPDIR $OTHER_UNZIPDIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   390
    $MKDIR -p $THIS_UNZIPDIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   391
    $MKDIR -p $OTHER_UNZIPDIR
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   392
    if [ "$TYPE" = "jimage" ]
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   393
    then
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   394
        (cd $THIS_UNZIPDIR && $JIMAGE extract $THIS_ZIP)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   395
        (cd $OTHER_UNZIPDIR && $JIMAGE extract $OTHER_ZIP)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   396
    else
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   397
        (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   398
        (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP)
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   399
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   400
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   401
    # Find all archives inside and unzip them as well to compare the contents rather than
15058
61c4ac49cbda 8005635: build-infra: Support building install in jprt
erikj
parents: 14466
diff changeset
   402
    # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
61c4ac49cbda 8005635: build-infra: Support building install in jprt
erikj
parents: 14466
diff changeset
   403
    EXCEPTIONS="pie.jar.pack.gz"
61c4ac49cbda 8005635: build-infra: Support building install in jprt
erikj
parents: 14466
diff changeset
   404
    for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   405
        ($UNPACK200 $pack $pack.jar)
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   406
        # Filter out the unzipped archives from the diff below.
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   407
        EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   408
    done
15058
61c4ac49cbda 8005635: build-infra: Support building install in jprt
erikj
parents: 14466
diff changeset
   409
    for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   410
        ($UNPACK200 $pack $pack.jar)
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   411
        EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   412
    done
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   413
    for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   414
        $MKDIR $zip.unzip
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   415
        (cd $zip.unzip && $UNARCHIVE $zip)
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   416
        EXCEPTIONS="$EXCEPTIONS $zip"
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   417
    done
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   418
    for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   419
        $MKDIR $zip.unzip
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   420
        (cd $zip.unzip && $UNARCHIVE $zip)
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   421
        EXCEPTIONS="$EXCEPTIONS $zip"
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   422
    done
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   423
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   424
    CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   425
    # On solaris, there is no -q option.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   426
    if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   427
        LC_ALL=C $DIFF -r $OTHER_UNZIPDIR $THIS_UNZIPDIR \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   428
            | $GREP -v -e "^<" -e "^>" -e "^Common subdirectories:" \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   429
            > $CONTENTS_DIFF_FILE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   430
    else
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   431
        LC_ALL=C $DIFF -rq $OTHER_UNZIPDIR $THIS_UNZIPDIR > $CONTENTS_DIFF_FILE
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   432
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   433
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   434
    ONLY_OTHER=$($GREP "^Only in $OTHER_UNZIPDIR" $CONTENTS_DIFF_FILE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   435
    ONLY_THIS=$($GREP "^Only in $THIS_UNZIPDIR" $CONTENTS_DIFF_FILE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   436
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   437
    return_value=0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   438
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   439
    if [ -n "$ONLY_OTHER" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   440
        echo "        Only OTHER $ZIP_FILE contains:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   441
        echo "$ONLY_OTHER" | sed "s|Only in $OTHER_UNZIPDIR|            |"g | sed 's|: |/|g'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   442
        return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   443
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   444
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   445
    if [ -n "$ONLY_THIS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   446
        echo "        Only THIS $ZIP_FILE contains:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   447
        echo "$ONLY_THIS" | sed "s|Only in $THIS_UNZIPDIR|            |"g | sed 's|: |/|g'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   448
        return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   449
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   450
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   451
    if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   452
        DIFFING_FILES=$($GREP -e 'differ$' -e '^diff ' $CONTENTS_DIFF_FILE \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   453
            | $SED -e 's/^Files //g' -e 's/diff -r //g' | $CUT -f 1 -d ' ' \
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   454
            | $SED "s|$OTHER_UNZIPDIR/||g")
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   455
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   456
        DIFFING_FILES=$($GREP -e "differ$" $CONTENTS_DIFF_FILE \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   457
            | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   458
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   459
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   460
    $RM -f $WORK_DIR/$ZIP_FILE.diffs
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   461
    for file in $DIFFING_FILES; do
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   462
        if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   463
            diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   464
        fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   465
    done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   466
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   467
    if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   468
        return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   469
        echo "        Differing files in $ZIP_FILE"
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   470
        $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP 'differ$' | cut -f 2 -d ' ' | \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   471
            $SED "s|$OTHER_UNZIPDIR|            |g" > $WORK_DIR/$ZIP_FILE.difflist
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   472
        $CAT $WORK_DIR/$ZIP_FILE.difflist
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   473
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   474
        if [ -n "$SHOW_DIFFS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   475
            for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   476
                if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   477
                    LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   478
                elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   479
                    LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   480
                else
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   481
                    LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   482
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   483
            done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   484
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   485
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   486
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   487
    return $return_value
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   488
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   489
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   490
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   491
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   492
# Compare all zip files
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   493
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   494
compare_all_zip_files() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   495
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   496
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   497
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   498
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   499
    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.zip" | $SORT | $FILTER )
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   500
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   501
    if [ -n "$ZIPS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   502
        echo Zip files...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   503
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   504
        return_value=0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   505
        for f in $ZIPS; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   506
            if [ -f "$OTHER_DIR/$f" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   507
                compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   508
                if [ "$?" != "0" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   509
                    return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   510
                    REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   511
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   512
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   513
        done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   514
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   515
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   516
    return $return_value
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   517
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   518
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   519
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   520
# Compare all jar files
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   521
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   522
compare_all_jar_files() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   523
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   524
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   525
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   526
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   527
    # TODO filter?
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   528
    ZIPS=$(cd $THIS_DIR && $FIND . -type f -name "*.jar" -o -name "*.war" \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
   529
        -o -name "*.jimage" | $SORT | $FILTER)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   530
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   531
    if [ -n "$ZIPS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   532
        echo Jar files...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   533
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   534
        return_value=0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   535
        for f in $ZIPS; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   536
            if [ -f "$OTHER_DIR/$f" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   537
                compare_zip_file $THIS_DIR $OTHER_DIR $WORK_DIR $f
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   538
                if [ "$?" != "0" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   539
                    return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   540
                    REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   541
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   542
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   543
        done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   544
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   545
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   546
    return $return_value
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   547
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   548
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   549
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   550
# Compare binary (executable/library) file
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   551
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   552
compare_bin_file() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   553
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   554
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   555
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   556
    BIN_FILE=$4
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   557
    OTHER_BIN_FILE=$5
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   558
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   559
    THIS_FILE=$THIS_DIR/$BIN_FILE
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   560
    if [ -n "$OTHER_BIN_FILE" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   561
        OTHER_FILE=$OTHER_DIR/$OTHER_BIN_FILE
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   562
    else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   563
        OTHER_FILE=$OTHER_DIR/$BIN_FILE
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
   564
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   565
    NAME=$(basename $BIN_FILE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   566
    WORK_FILE_BASE=$WORK_DIR/$BIN_FILE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   567
    FILE_WORK_DIR=$(dirname $WORK_FILE_BASE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   568
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   569
    $MKDIR -p $FILE_WORK_DIR
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   570
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   571
    # Make soft links to original files from work dir to facilitate debugging
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   572
    $LN -f -s $THIS_FILE $WORK_FILE_BASE.this
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   573
    $LN -f -s $OTHER_FILE $WORK_FILE_BASE.other
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   574
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   575
    ORIG_THIS_FILE="$THIS_FILE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   576
    ORIG_OTHER_FILE="$OTHER_FILE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   577
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 31310
diff changeset
   578
    if [ "$STRIP_ALL" = "true" ] || [[ "$STRIP_BEFORE_COMPARE" = *"$BIN_FILE"* ]]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   579
        THIS_STRIPPED_FILE=$FILE_WORK_DIR/this/$NAME
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   580
        OTHER_STRIPPED_FILE=$FILE_WORK_DIR/other/$NAME
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   581
        $MKDIR -p $FILE_WORK_DIR/this $FILE_WORK_DIR/other
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   582
        $CP $THIS_FILE $THIS_STRIPPED_FILE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   583
        $CP $OTHER_FILE $OTHER_STRIPPED_FILE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   584
        $STRIP $THIS_STRIPPED_FILE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   585
        $STRIP $OTHER_STRIPPED_FILE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   586
        THIS_FILE="$THIS_STRIPPED_FILE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   587
        OTHER_FILE="$OTHER_STRIPPED_FILE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   588
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   589
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   590
    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   591
        unset _NT_SYMBOL_PATH
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   592
        # On windows we need to unzip the debug symbols, if present
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   593
        OTHER_FILE_BASE=${OTHER_FILE/.dll/}
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   594
        OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/}
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   595
        OTHER_FILE_BASE=${OTHER_FILE_BASE/.cpl/}
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   596
        DIZ_NAME=$(basename $OTHER_FILE_BASE).diz
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   597
        # Some .exe files have the same name as a .dll file. Make sure the exe
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   598
        # files get the right debug symbols.
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   599
        if [ "$NAME" = "java.exe" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   600
               && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   601
            OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   602
        elif [ "$NAME" = "jimage.exe" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   603
               && [ -f "$OTHER/support/native/jdk.dev/jimage_objs/jimage.diz" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   604
            OTHER_DIZ_FILE="$OTHER/support/native/jdk.dev/jimage_objs/jimage.diz"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   605
        elif [ "$NAME" = "javacpl.exe" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   606
               && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   607
            OTHER_DIZ_FILE="$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz"
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   608
        elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   609
            OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   610
        else
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   611
            # Some files, jli.dll, appears twice in the image but only one of
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   612
            # thme has a diz file next to it.
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   613
            OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   614
            if [ ! -f "$OTHER_DIZ_FILE" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   615
                # As a last resort, look for diz file in the whole build output
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   616
                # dir.
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   617
                OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   618
            fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   619
        fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   620
        if [ -n "$OTHER_DIZ_FILE" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   621
            $MKDIR -p $FILE_WORK_DIR/other
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   622
            (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE)
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   623
            export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   624
        fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   625
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   626
        THIS_FILE_BASE=${THIS_FILE/.dll/}
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   627
        THIS_FILE_BASE=${THIS_FILE_BASE/.exe/}
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   628
        THIS_FILE_BASE=${THIS_FILE_BASE/.cpl/}
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   629
        # Some .exe files have the same name as a .dll file. Make sure the exe
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   630
        # files get the right debug symbols.
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   631
        if [ "$NAME" = "java.exe" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   632
               && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   633
            THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   634
        elif [ "$NAME" = "jimage.exe" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   635
               && [ -f "$THIS/support/native/jdk.dev/jimage_objs/jimage.diz" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   636
            THIS_DIZ_FILE="$THIS/support/native/jdk.dev/jimage_objs/jimage.diz"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   637
        elif [ "$NAME" = "javacpl.exe" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   638
               && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   639
            THIS_DIZ_FILE="$THIS/support/native/jdk.plugin/javacpl/javacpl.diz"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   640
        elif [ -f "${THIS_FILE_BASE}.diz" ]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   641
            THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   642
        else
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   643
            THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   644
            if [ ! -f "$THIS_DIZ_FILE" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   645
                # As a last resort, look for diz file in the whole build output
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   646
                # dir.
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   647
                THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   648
            fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   649
        fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   650
        if [ -n "$THIS_DIZ_FILE" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   651
            $MKDIR -p $FILE_WORK_DIR/this
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   652
            (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE)
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   653
            export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   654
        fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   655
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   656
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   657
    if [ -z "$SKIP_BIN_DIFF" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   658
        if cmp $OTHER_FILE $THIS_FILE > /dev/null; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   659
        # The files were bytewise identical.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   660
            if [ -n "$VERBOSE" ]; then
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
   661
                echo "        :           :         :         :          :          : $BIN_FILE"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   662
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   663
            return 0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   664
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   665
        BIN_MSG=" diff "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   666
        if [[ "$ACCEPTED_BIN_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   667
            DIFF_BIN=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   668
            if [[ "$KNOWN_BIN_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   669
                BIN_MSG="*$BIN_MSG*"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   670
                REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   671
            else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   672
                BIN_MSG=" $BIN_MSG "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   673
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   674
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   675
            BIN_MSG="($BIN_MSG)"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   676
            DIFF_BIN=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   677
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   678
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   679
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   680
    if [ -n "$STAT" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   681
        THIS_SIZE=$($STAT $STAT_PRINT_SIZE "$THIS_FILE")
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   682
        OTHER_SIZE=$($STAT $STAT_PRINT_SIZE "$OTHER_FILE")
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   683
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   684
        THIS_SIZE=$(ls -l "$THIS_FILE" | awk '{ print $5 }')
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   685
        OTHER_SIZE=$(ls -l "$OTHER_FILE" | awk '{ print $5 }')
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   686
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   687
    if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   688
        DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   689
        DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   690
        SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
14458
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
   691
        if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   692
            && [ "$DIFF_SIZE_REL" -lt 102 ]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   693
            SIZE_MSG="($SIZE_MSG)"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   694
            DIFF_SIZE=
14458
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
   695
        elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   696
            && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   697
            && [ "$DIFF_SIZE_NUM" = 512 ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   698
            # On windows, size of binaries increase in 512 increments.
14458
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
   699
            SIZE_MSG="($SIZE_MSG)"
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
   700
            DIFF_SIZE=
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
   701
        elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   702
            && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   703
            && [ "$DIFF_SIZE_NUM" = -512 ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   704
            # On windows, size of binaries increase in 512 increments.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   705
            SIZE_MSG="($SIZE_MSG)"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   706
            DIFF_SIZE=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   707
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   708
            if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   709
                DIFF_SIZE=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   710
                if [[ "$KNOWN_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   711
                    SIZE_MSG="*$SIZE_MSG*"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   712
                    REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   713
                else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   714
                    SIZE_MSG=" $SIZE_MSG "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   715
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   716
            else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   717
                SIZE_MSG="($SIZE_MSG)"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   718
                DIFF_SIZE=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   719
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   720
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   721
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   722
        SIZE_MSG="           "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   723
        DIFF_SIZE=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   724
        if [[ "$KNOWN_SIZE_DIFF $ACCEPTED_SIZE_DIFF" = *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   725
            SIZE_MSG="     !     "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   726
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   727
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   728
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   729
    if [ "$SORT_ALL_SYMBOLS" = "true" ] || [[ "$SORT_SYMBOLS" = *"$BIN_FILE"* ]]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   730
        SYM_SORT_CMD="sort"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   731
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   732
        SYM_SORT_CMD="cat"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   733
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   734
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   735
    # Check symbols
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   736
    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   737
        # The output from dumpbin on windows differs depending on if the debug symbol
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   738
        # files are still around at the location the binary is pointing too. Need
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   739
        # to filter out that extra information.
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   740
        $DUMPBIN -exports $OTHER_FILE | $GREP  -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   741
        $DUMPBIN -exports $THIS_FILE  | $GREP  -E '^ +[0-9A-F]+ +[0-9A-F]+ [0-9A-F]+' | sed 's/ = .*//g' | cut -c27- | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   742
    elif [ "$OPENJDK_TARGET_OS" = "solaris" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   743
        # Some symbols get seemingly random 15 character prefixes. Filter them out.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   744
        $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
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   745
        $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
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   746
    elif [ "$OPENJDK_TARGET_OS" = "aix" ]; then
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   747
        $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
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   748
        $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
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
   749
    elif [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
   750
        $NM -j $ORIG_OTHER_FILE 2> /dev/null | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.other
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
   751
        $NM -j $ORIG_THIS_FILE  2> /dev/null | $SYM_SORT_CMD > $WORK_FILE_BASE.symbols.this
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   752
    else
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   753
        $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
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   754
        $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
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   755
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   756
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   757
    LC_ALL=C $DIFF $WORK_FILE_BASE.symbols.other $WORK_FILE_BASE.symbols.this > $WORK_FILE_BASE.symbols.diff
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   758
    if [ -s $WORK_FILE_BASE.symbols.diff ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   759
        SYM_MSG=" diff  "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   760
        if [[ "$ACCEPTED_SYM_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   761
            DIFF_SYM=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   762
            if [[ "$KNOWN_SYM_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   763
                SYM_MSG="*$SYM_MSG*"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   764
                REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   765
            else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   766
                SYM_MSG=" $SYM_MSG "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   767
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   768
        else
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   769
            SYM_MSG="($SYM_MSG)"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   770
            DIFF_SYM=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   771
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   772
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   773
        SYM_MSG="         "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   774
        DIFF_SYM=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   775
        if [[ "$KNOWN_SYM_DIFF $ACCEPTED_SYM_DIFF" = *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   776
            SYM_MSG="    !    "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   777
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   778
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   779
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   780
    # Check dependencies
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   781
    if [ -n "$LDD_CMD" ]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   782
        (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq)
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   783
        (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2</dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq)
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   784
        (cd $FILE_WORK_DIR && $RM -f $NAME)
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   785
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   786
        LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   787
        LC_ALL=C $DIFF $WORK_FILE_BASE.deps.other.uniq $WORK_FILE_BASE.deps.this.uniq > $WORK_FILE_BASE.deps.diff.uniq
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   788
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   789
        if [ -s $WORK_FILE_BASE.deps.diff ]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   790
            if [ -s $WORK_FILE_BASE.deps.diff.uniq ]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   791
                DEP_MSG=" diff  "
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   792
            else
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   793
                DEP_MSG=" redun "
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   794
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   795
            if [[ "$ACCEPTED_DEP_DIFF" != *"$BIN_FILE"* ]]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   796
                DIFF_DEP=true
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   797
                if [[ "$KNOWN_DEP_DIFF" != *"$BIN_FILE"* ]]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   798
                    DEP_MSG="*$DEP_MSG*"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   799
                    REGRESSIONS=true
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   800
                else
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   801
                    DEP_MSG=" $DEP_MSG "
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   802
                fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   803
            else
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   804
                DEP_MSG="($DEP_MSG)"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   805
                DIFF_DEP=
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   806
            fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   807
        else
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   808
            DEP_MSG="         "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   809
            DIFF_DEP=
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   810
            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   811
                DEP_MSG="     !      "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   812
            fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   813
        fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   814
    else
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   815
        DEP_MSG="    -    "
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   816
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   817
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   818
    # Some linux compilers add a unique Build ID
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   819
    if [ "$OPENJDK_TARGET_OS" = "linux" ]; then
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   820
      BUILD_ID_FILTER="$SED -r 's/(Build ID:) [0-9a-f]{40}/\1/'"
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   821
    else
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   822
      BUILD_ID_FILTER="$CAT"
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   823
    fi
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   824
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   825
    # Compare fulldump output
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   826
    if [ -n "$FULLDUMP_CMD" ] && [ -z "$SKIP_FULLDUMP_DIFF" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   827
        if [ -z "$FULLDUMP_DIFF_FILTER" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   828
            FULLDUMP_DIFF_FILTER="$CAT"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   829
        fi
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   830
        $FULLDUMP_CMD $OTHER_FILE | eval "$BUILD_ID_FILTER" | eval "$FULLDUMP_DIFF_FILTER" \
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   831
            > $WORK_FILE_BASE.fulldump.other 2>&1
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33441
diff changeset
   832
        $FULLDUMP_CMD $THIS_FILE  | eval "$BUILD_ID_FILTER" | eval "$FULLDUMP_DIFF_FILTER" \
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   833
            > $WORK_FILE_BASE.fulldump.this  2>&1
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   834
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   835
        LC_ALL=C $DIFF $WORK_FILE_BASE.fulldump.other $WORK_FILE_BASE.fulldump.this \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   836
            > $WORK_FILE_BASE.fulldump.diff
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   837
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   838
        if [ -s $WORK_FILE_BASE.fulldump.diff ]; then
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   839
            FULLDUMP_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.fulldump.diff | awk '{print $5}')
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   840
            FULLDUMP_MSG=$($PRINTF "%8d" $FULLDUMP_DIFF_SIZE)
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   841
            if [[ "$ACCEPTED_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   842
                DIFF_FULLDUMP=true
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   843
                if [[ "$KNOWN_FULLDUMP_DIFF" != *"$BIN_FILE"* ]]; then
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   844
                    FULLDUMP_MSG="*$FULLDUMP_MSG*"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   845
                    REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   846
                else
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   847
                    FULLDUMP_MSG=" $FULLDUMP_MSG "
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   848
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   849
            else
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   850
                FULLDUMP_MSG="($FULLDUMP_MSG)"
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   851
                DIFF_FULLDUMP=
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   852
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   853
        else
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   854
            FULLDUMP_MSG="          "
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   855
            DIFF_FULLDUMP=
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   856
            if [[ "$KNOWN_FULLDUMP_DIFF $ACCEPTED_FULLDUMP_DIFF" = *"$BIN_FILE"* ]]; then
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   857
                FULLDUMP_MSG="    !    "
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   858
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   859
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   860
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   861
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   862
    # Compare disassemble output
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   863
    if [ -n "$DIS_CMD" ] && [ -z "$SKIP_DIS_DIFF" ]; then
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   864
        # By default we filter out differences that include references to symbols.
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   865
        # To get a raw diff with the complete disassembly, set
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   866
        # DIS_DIFF_FILTER="$CAT"
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   867
        if [ -z "$DIS_DIFF_FILTER" ]; then
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   868
            DIS_DIFF_FILTER="$GREP -v ' # .* <.*>$' | $SED -r -e 's/(\b|x)([0-9a-fA-F]+)(\b|:|>)/X/g'"
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   869
        fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   870
        if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   871
            DIS_GREP_ARG=-a
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   872
        else
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   873
            DIS_GREP_ARG=
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   874
        fi
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   875
        $DIS_CMD $OTHER_FILE | $GREP $DIS_GREP_ARG -v $NAME \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   876
            | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.other 2>&1
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   877
        $DIS_CMD $THIS_FILE  | $GREP $DIS_GREP_ARG -v $NAME \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   878
            | eval "$DIS_DIFF_FILTER" > $WORK_FILE_BASE.dis.this  2>&1
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   879
20049
f17192b4bc71 8006661: Use LC_ALL=C instead of LANG=C compare.sh
ihse
parents: 16661
diff changeset
   880
        LC_ALL=C $DIFF $WORK_FILE_BASE.dis.other $WORK_FILE_BASE.dis.this > $WORK_FILE_BASE.dis.diff
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   881
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   882
        if [ -s $WORK_FILE_BASE.dis.diff ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   883
            DIS_DIFF_SIZE=$(ls -n $WORK_FILE_BASE.dis.diff | awk '{print $5}')
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   884
            DIS_MSG=$($PRINTF "%8d" $DIS_DIFF_SIZE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   885
            if [[ "$ACCEPTED_DIS_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   886
                DIFF_DIS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   887
                if [[ "$KNOWN_DIS_DIFF" != *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   888
                    DIS_MSG="*$DIS_MSG*"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   889
                    REGRESSIONS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   890
                else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   891
                    DIS_MSG=" $DIS_MSG "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   892
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   893
            else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   894
                DIS_MSG="($DIS_MSG)"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   895
                DIFF_DIS=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   896
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   897
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   898
            DIS_MSG="          "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   899
            DIFF_DIS=
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   900
            if [[ "$KNOWN_DEP_DIFF $ACCEPTED_DEP_DIFF" = *"$BIN_FILE"* ]]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   901
                DIS_MSG="    !    "
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   902
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   903
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   904
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   905
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   906
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   907
    if [ -n "$DIFF_BIN$DIFF_SIZE$DIFF_SYM$DIFF_DEP$DIFF_FULLDUMP$DIFF_DIS" ] || [ -n "$VERBOSE" ]; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   908
        if [ -n "$BIN_MSG" ]; then echo -n "$BIN_MSG:"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   909
        if [ -n "$SIZE_MSG" ]; then echo -n "$SIZE_MSG:"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   910
        if [ -n "$SYM_MSG" ]; then echo -n "$SYM_MSG:"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   911
        if [ -n "$DEP_MSG" ]; then echo -n "$DEP_MSG:"; fi
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
   912
        if [ -n "$FULLDUMP_MSG" ]; then echo -n "$FULLDUMP_MSG:"; fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   913
        if [ -n "$DIS_MSG" ]; then echo -n "$DIS_MSG:"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   914
        echo " $BIN_FILE"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   915
        if [ "$SHOW_DIFFS" = "true" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   916
            if [ -s "$WORK_FILE_BASE.symbols.diff" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   917
                echo "Symbols diff:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   918
                $CAT $WORK_FILE_BASE.symbols.diff
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   919
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   920
            if [ -s "$WORK_FILE_BASE.deps.diff" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   921
                echo "Deps diff:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   922
                $CAT $WORK_FILE_BASE.deps.diff
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   923
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   924
            if [ -s "$WORK_FILE_BASE.fulldump.diff" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   925
                echo "Fulldump diff:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   926
                $CAT $WORK_FILE_BASE.fulldump.diff
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   927
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   928
            if [ -s "$WORK_FILE_BASE.dis.diff" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   929
                echo "Disassembly diff:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   930
                $CAT $WORK_FILE_BASE.dis.diff
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   931
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   932
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   933
        return 1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   934
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   935
    return 0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   936
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   937
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   938
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   939
# Print binary diff header
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   940
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   941
print_binary_diff_header() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   942
    if [ -z "$SKIP_BIN_DIFF" ]; then echo -n " Binary :"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   943
    if [ -z "$SKIP_SIZE_DIFF" ]; then echo -n "   Size    :"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   944
    if [ -z "$SKIP_SYM_DIFF" ]; then echo -n " Symbols :"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   945
    if [ -z "$SKIP_DEP_DIFF" ]; then echo -n "  Deps   :"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   946
    if [ -z "$SKIP_FULLDUMP_DIFF" ]; then echo -n " Fulldump :"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   947
    if [ -z "$SKIP_DIS_DIFF" ]; then echo -n " Disass   :"; fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   948
    echo
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   949
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   950
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   951
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   952
# Compare all libraries
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   953
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   954
compare_all_libs() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   955
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   956
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   957
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   958
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   959
    LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' \
35370
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 34596
diff changeset
   960
        -o -name '*.dll' -o -name '*.obj' -o -name '*.o' -o -name '*.a' \
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
   961
        -o -name '*.cpl' \) | $SORT | $FILTER)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   962
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   963
    if [ -n "$LIBS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   964
        echo Libraries...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   965
        print_binary_diff_header
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   966
        for l in $LIBS; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   967
            if [ -f "$OTHER_DIR/$l" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   968
                compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $l
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   969
                if [ "$?" != "0" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   970
                    return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   971
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   972
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   973
        done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   974
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   975
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   976
    return $return_value
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   977
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   978
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
   979
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   980
# Compare all executables
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   981
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   982
compare_all_execs() {
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   983
    THIS_DIR=$1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   984
    OTHER_DIR=$2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   985
    WORK_DIR=$3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   986
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   987
    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   988
        EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
   989
    else
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   990
        EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   991
            \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   992
            -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   993
            -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   994
            -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   995
            -o -name '*.xml' -o -name '*.html' -o -name '*.png' -o -name 'README' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   996
            -o -name '*.zip' -o -name '*.jimage' -o -name '*.java' -o -name '*.mf' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   997
            -o -name '*.jpg' -o -name '*.wsdl' -o -name '*.js' -o -name '*.sh' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   998
            -o -name '*.bat' -o -name '*LICENSE' -o -name '*.d' -o -name '*store' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
   999
            -o -name 'blacklist' -o -name '*certs' -o -name '*.ttf' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1000
            -o -name '*.jfc' -o -name '*.dat'  -o -name 'release' -o -name '*.dir'\
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1001
            -o -name '*.sym' -o -name '*.idl' -o -name '*.h' -o -name '*.access' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1002
            -o -name '*.template' -o -name '*.policy' -o -name '*.security' \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1003
            -o -name 'COPYRIGHT' -o -name '*.1' \
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
  1004
            -o -name 'classlist' \) | $SORT | $FILTER)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1005
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1006
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1007
    if [ -n "$EXECS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1008
        echo Executables...
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1009
        print_binary_diff_header
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1010
        for e in $EXECS; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1011
            if [ -f "$OTHER_DIR/$e" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1012
                compare_bin_file $THIS_DIR $OTHER_DIR $WORK_DIR $e
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1013
                if [ "$?" != "0" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1014
                    return_value=1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1015
                fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1016
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1017
        done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1018
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1019
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1020
    return $return_value
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1021
}
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1022
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1023
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1024
# Initiate configuration
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1025
33441
ce975712c050 8141439: Fix compare.sh -o <otherdir> (broken by JDK-8136813)
ihse
parents: 33031
diff changeset
  1026
THIS="$SCRIPT_DIR"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1027
echo "$THIS"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1028
THIS_SCRIPT="$0"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1029
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1030
if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1" = "/?" ] || [ "$1" = "-help" ] || [ "$1" = "--help" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1031
    echo "bash ./compare.sh [OPTIONS] [FILTER]"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1032
    echo ""
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1033
    echo "-all                Compare all files in all known ways"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1034
    echo "-names              Compare the file names and directory structure"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1035
    echo "-perms              Compare the permission bits on all files and directories"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1036
    echo "-types              Compare the output of the file command on all files"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1037
    echo "-general            Compare the files not convered by the specialized comparisons"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1038
    echo "-zips               Compare the contents of all zip files"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1039
    echo "-jars               Compare the contents of all jar files"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1040
    echo "-libs               Compare all native libraries"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1041
    echo "-execs              Compare all executables"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1042
    echo "-v                  Verbose output, does not hide known differences"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1043
    echo "-vv                 More verbose output, shows diff output of all comparisons"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1044
    echo "-o [OTHER]          Compare with build in other directory. Will default to the old build directory"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1045
    echo ""
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
  1046
    echo "--sort-symbols      Sort all symbols before comparing"
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 31310
diff changeset
  1047
    echo "--strip             Strip all binaries before comparing"
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1048
    echo "--clean             Clean all previous comparison results first"
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 31310
diff changeset
  1049
    echo ""
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1050
    echo "[FILTER]            List filenames in the image to compare, works for jars, zips, libs and execs"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1051
    echo "Example:"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1052
    echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1053
    echo ""
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1054
    echo "-2zips <file1> <file2> Compare two zip files only"
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1055
    echo "-2bins <file1> <file2> Compare two binary files only"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1056
    echo "-2dirs <dir1> <dir2> Compare two directories as if they were images"
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1057
    echo ""
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1058
    exit 10
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1059
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1060
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1061
CMP_NAMES=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1062
CMP_PERMS=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1063
CMP_TYPES=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1064
CMP_GENERAL=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1065
CMP_ZIPS=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1066
CMP_JARS=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1067
CMP_LIBS=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1068
CMP_EXECS=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1069
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1070
while [ -n "$1" ]; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1071
    case "$1" in
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1072
        -v)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1073
            VERBOSE=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1074
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1075
        -vv)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1076
            VERBOSE=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1077
            SHOW_DIFFS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1078
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1079
        -o)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1080
            OTHER="$2"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1081
            shift
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1082
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1083
        -all)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1084
            CMP_NAMES=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1085
            if [ "$OPENJDK_TARGET_OS" != "windows" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1086
                CMP_PERMS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1087
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1088
            CMP_TYPES=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1089
            CMP_GENERAL=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1090
            CMP_ZIPS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1091
            CMP_JARS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1092
            CMP_LIBS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1093
            CMP_EXECS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1094
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1095
        -names)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1096
            CMP_NAMES=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1097
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1098
        -perms)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1099
            CMP_PERMS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1100
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1101
        -types)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1102
            CMP_TYPES=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1103
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1104
        -general)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1105
            CMP_GENERAL=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1106
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1107
        -zips)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1108
            CMP_ZIPS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1109
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1110
        -jars)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1111
            CMP_JARS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1112
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1113
        -libs)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1114
            CMP_LIBS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1115
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1116
        -execs)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1117
            CMP_EXECS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1118
            ;;
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1119
        -2dirs)
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1120
            THIS="$(cd "$2" > /dev/null && pwd )"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1121
            OTHER="$(cd "$3" > /dev/null && pwd )"
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1122
            THIS_BASE_DIR="$THIS"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1123
            OTHER_BASE_DIR="$OTHER"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1124
            SKIP_DEFAULT=true
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1125
            shift
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1126
            shift
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1127
            ;;
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1128
        -2zips)
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1129
            CMP_2_ZIPS=true
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1130
            THIS_FILE=$2
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1131
            OTHER_FILE=$3
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1132
            shift
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1133
            shift
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1134
            ;;
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1135
        -2bins)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1136
            CMP_2_BINS=true
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1137
            THIS_FILE=$2
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1138
            OTHER_FILE=$3
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1139
            shift
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1140
            shift
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1141
            ;;
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
  1142
        --sort-symbols)
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
  1143
            SORT_ALL_SYMBOLS=true
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
  1144
            ;;
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 31310
diff changeset
  1145
        --strip)
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 31310
diff changeset
  1146
            STRIP_ALL=true
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 31310
diff changeset
  1147
            ;;
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1148
        --clean)
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1149
            CLEAN_OUTPUT=true
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1150
            ;;
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1151
        *)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1152
            CMP_NAMES=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1153
            CMP_PERMS=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1154
            CMP_TYPES=false
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1155
            CMP_ZIPS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1156
            CMP_JARS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1157
            CMP_LIBS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1158
            CMP_EXECS=true
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1159
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1160
            if [ -z "$FILTER" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1161
                FILTER="$GREP"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1162
            fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1163
            FILTER="$FILTER -e $1"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1164
            ;;
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1165
    esac
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1166
    shift
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1167
done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1168
35747
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1169
if [ "$STRIP_ALL" = "true" ] && [ -z "$STRIP" ]; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1170
  echo Warning: Not stripping even with --strip, since strip is missing on this platform
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1171
  STRIP_ALL=false
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1172
fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1173
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1174
COMPARE_ROOT=/tmp/cimages.$USER
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1175
if [ "$CLEAN_OUTPUT" = "true" ]; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1176
    echo Cleaning old output in $COMPARE_ROOT.
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1177
    $RM -rf $COMPARE_ROOT
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1178
fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1179
$MKDIR -p $COMPARE_ROOT
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1180
if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1181
    if [ "$(uname -o)" = "Cygwin" ]; then
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1182
        COMPARE_ROOT=$(cygpath -msa $COMPARE_ROOT)
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1183
    fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1184
fi
aeaa6d0101a8 8149647: Incremental enhancements from build-infra
ihse
parents: 35744
diff changeset
  1185
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1186
if [ "$CMP_2_ZIPS" = "true" ]; then
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1187
    THIS_DIR="$(dirname $THIS_FILE)"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1188
    THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1189
    OTHER_DIR="$(dirname $OTHER_FILE)"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1190
    OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"
15179
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1191
    THIS_FILE_NAME="$(basename $THIS_FILE)"
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1192
    OTHER_FILE_NAME="$(basename $OTHER_FILE)"
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1193
    echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1194
    compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1195
    exit
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1196
fi
d5be3992e87e 8006663: build-infra: Compare two arbitrary zip/jar files with compare.sh
erikj
parents: 15068
diff changeset
  1197
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1198
if [ "$CMP_2_BINS" = "true" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1199
    THIS_DIR="$(dirname $THIS_FILE)"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1200
    THIS_DIR="$(cd "$THIS_DIR" > /dev/null && pwd )"
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1201
    OTHER_DIR="$(dirname $OTHER_FILE)"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1202
    OTHER_DIR="$(cd "$OTHER_DIR" > /dev/null && pwd )"
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1203
    THIS_FILE_NAME="$(basename $THIS_FILE)"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1204
    OTHER_FILE_NAME="$(basename $OTHER_FILE)"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1205
    echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1206
    compare_bin_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2bins $THIS_FILE_NAME $OTHER_FILE_NAME
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1207
    exit
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1208
fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1209
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1210
if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1211
    CMP_NAMES=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1212
    CMP_PERMS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1213
    CMP_TYPES=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1214
    CMP_GENERAL=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1215
    CMP_ZIPS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1216
    CMP_JARS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1217
    CMP_LIBS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1218
    CMP_EXECS=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1219
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1220
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1221
if [ -z "$FILTER" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1222
    FILTER="$CAT"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1223
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1224
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1225
if [ "$SKIP_DEFAULT" != "true" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1226
    if [ -z "$OTHER" ]; then
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1227
        echo "Nothing to compare to, set with -o"
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1228
        exit 1
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1229
    else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1230
        if [ ! -d "$OTHER" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1231
            echo "Other build directory does not exist:"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1232
            echo "$OTHER"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1233
            exit 1
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1234
        fi
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1235
        OTHER="$( cd "$OTHER" > /dev/null && pwd )"
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1236
        echo "Comparing to:"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1237
        echo "$OTHER"
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1238
        echo
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1239
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1240
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1241
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1242
    # Find the common images to compare, prioritizing later build stages
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
  1243
    if [ -d "$THIS/install/jdk" ] && [ -d "$OTHER/install/jdk" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1244
        THIS_JDK="$THIS/install/jdk"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1245
        THIS_JRE="$THIS/install/jre"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1246
        OTHER_JDK="$OTHER/install/jdk"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1247
        OTHER_JRE="$OTHER/install/jre"
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1248
        echo "Selecting install images for compare"
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1249
    elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1250
        THIS_JDK="$THIS/images/jdk"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1251
        THIS_JRE="$THIS/images/jre"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1252
        OTHER_JDK="$OTHER/deploy/images/jdk"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1253
        OTHER_JRE="$OTHER/deploy/images/jre"
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1254
        echo "Selecting deploy images for compare"
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 25854
diff changeset
  1255
    elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1256
        THIS_JDK="$THIS/images/jdk"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1257
        THIS_JRE="$THIS/images/jre"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1258
        OTHER_JDK="$OTHER/images/jdk"
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1259
        OTHER_JRE="$OTHER/images/jre"
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1260
        echo "Selecting jdk images for compare"
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1261
    else
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1262
        echo "No common images found."
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1263
        exit 1
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1264
    fi
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1265
    echo "  $THIS_JDK"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1266
    echo "  $OTHER_JDK"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1267
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1268
    if [ -d "$THIS/images/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1269
	     && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1270
	if [ -d "$THIS/deploy/images/jdk-bundle" ]; then
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1271
            THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1272
            THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1273
	else
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1274
            THIS_JDK_BUNDLE="$THIS/images/jdk-bundle"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1275
            THIS_JRE_BUNDLE="$THIS/images/jre-bundle"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1276
	fi
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1277
	if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1278
            OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1279
            OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1280
	else
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1281
            OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1282
            OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1283
	fi
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 31310
diff changeset
  1284
        echo "Also comparing jdk macosx bundles"
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1285
        echo "  $THIS_JDK_BUNDLE"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1286
        echo "  $OTHER_JDK_BUNDLE"
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1287
    fi
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1288
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1289
    if [ -d "$THIS/deploy/bundles" -o -d "$THIS/deploy/images/bundles" ] \
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1290
	     && [ -d "$OTHER/deploy/bundles" -o -d "$OTHER/deploy/images/bundles" ]; then
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1291
	if [ -d "$THIS/deploy/images/bundles" ]; then
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1292
            THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/images/bundles"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1293
	else
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1294
            THIS_DEPLOY_BUNDLE_DIR="$THIS/deploy/bundles"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1295
	fi
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1296
	if [ -d "$OTHER/deploy/images/bundles" ]; then
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1297
            OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/images/bundles"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1298
	else
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1299
            OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1300
	fi
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1301
        echo "Also comparing deploy javadoc bundles"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1302
    fi
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1303
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1304
    if [ -d "$THIS/images/JavaAppletPlugin.plugin" ] \
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1305
	     && [ -d "$OTHER/images/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1306
	if [ -d "$THIS/images/JavaAppletPlugin.plugin" ]; then
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1307
            THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/images/JavaAppletPlugin.plugin"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1308
	else
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1309
            THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin"
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1310
	fi
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1311
	if [ -d "$OTHER/images/JavaAppletPlugin.plugin" ]; then
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1312
            OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/images/JavaAppletPlugin.plugin"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1313
	else
29158
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1314
            OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin"
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1315
	fi
5d46751992d9 8074055: Improvements in compare.sh from build-infra
ihse
parents: 29157
diff changeset
  1316
        echo "Also comparing deploy applet image"
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1317
        echo "  $THIS_DEPLOY_APPLET_PLUGIN_DIR"
481585782338 8081814: Modularize the deploy build
erikj
parents: 29158
diff changeset
  1318
        echo "  $OTHER_DEPLOY_APPLET_PLUGIN_DIR"
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1319
    fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1320
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1321
    if [ -d "$THIS/install/sparkle/Sparkle.framework" ] \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1322
           && [ -d "$OTHER/install/sparkle/Sparkle.framework" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1323
        THIS_SPARKLE_DIR="$THIS/install/sparkle/Sparkle.framework"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1324
        OTHER_SPARKLE_DIR="$OTHER/install/sparkle/Sparkle.framework"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1325
        echo "Also comparing install sparkle framework"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1326
        echo "  $THIS_SPARKLE_DIR"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1327
        echo "  $OTHER_SPARKLE_DIR"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1328
    fi
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1329
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1330
    if [ -d "$OTHER/images" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1331
        OTHER_SEC_DIR="$OTHER/images"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1332
    else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1333
        OTHER_SEC_DIR="$OTHER/tmp"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1334
    fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1335
    OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1336
    THIS_SEC_DIR="$THIS/images"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1337
    THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1338
    if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1339
        if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1340
            JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1341
        else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1342
            JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1343
        fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1344
        OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1345
        OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1346
        THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1347
        THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1348
    fi
14466
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1349
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1350
    if [ -d "$THIS/images/docs" ] && [ -d "$OTHER/images/docs" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1351
        THIS_DOCS="$THIS/images/docs"
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1352
        OTHER_DOCS="$OTHER/images/docs"
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1353
        echo "Also comparing docs"
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 25854
diff changeset
  1354
    else
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1355
        echo "WARNING! Docs haven't been built and won't be compared."
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1356
    fi
15063
16aa1979a584 8005723: build-infra: in new infra build, sec-windows-bin-zip and jgss-windows-*-bin.zip are missing
erikj
parents: 15062
diff changeset
  1357
fi
15062
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15059
diff changeset
  1358
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1359
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1360
# Do the work
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1361
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1362
if [ "$CMP_NAMES" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1363
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1364
        echo -n "JDK "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1365
        compare_dirs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1366
        echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1367
        compare_dirs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1368
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1369
        echo -n "JDK "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1370
        compare_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1371
        echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1372
        compare_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1373
    fi
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1374
    if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1375
        echo -n "JDK Bundle "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1376
        compare_dirs $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1377
        echo -n "JRE Bundle "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1378
        compare_dirs $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1379
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1380
        echo -n "JDK Bundle "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1381
        compare_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1382
        echo -n "JRE Bundle "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1383
        compare_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1384
    fi
14466
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1385
    if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1386
        echo -n "Docs "
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1387
        compare_dirs $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1388
        echo -n "Docs "
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1389
        compare_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1390
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1391
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1392
        compare_dirs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1393
        compare_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1394
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1395
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1396
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1397
        compare_dirs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1398
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1399
        compare_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1400
    fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1401
    if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1402
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1403
        compare_dirs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1404
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1405
        compare_files $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1406
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1407
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1408
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1409
if [ "$CMP_PERMS" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1410
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1411
        echo -n "JDK "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1412
        compare_permissions $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1413
        echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1414
        compare_permissions $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1415
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1416
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1417
        compare_permissions $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1418
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1419
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1420
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1421
        compare_permissions $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1422
    fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1423
    if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1424
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1425
        compare_permissions $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1426
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1427
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1428
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1429
if [ "$CMP_TYPES" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1430
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1431
        echo -n "JDK "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1432
        compare_file_types $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1433
        echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1434
        compare_file_types $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1435
    fi
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1436
    if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1437
        echo -n "JDK Bundle "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1438
        compare_file_types $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1439
        echo -n "JRE Bundle "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1440
        compare_file_types $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1441
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1442
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1443
        compare_file_types $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1444
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1445
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1446
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1447
        compare_file_types $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1448
    fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1449
    if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1450
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1451
        compare_file_types $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1452
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1453
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1454
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1455
if [ "$CMP_GENERAL" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1456
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1457
        echo -n "JDK "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1458
        compare_general_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1459
        echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1460
        compare_general_files $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1461
    fi
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1462
    if [ -n "$THIS_JDK_BUNDLE" ] && [ -n "$OTHER_JDK_BUNDLE" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1463
        echo -n "JDK Bundle "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1464
        compare_general_files $THIS_JDK_BUNDLE $OTHER_JDK_BUNDLE $COMPARE_ROOT/jdk-bundle
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1465
        echo -n "JRE Bundle "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1466
        compare_general_files $THIS_JRE_BUNDLE $OTHER_JRE_BUNDLE $COMPARE_ROOT/jre-bundle
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1467
    fi
14466
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1468
    if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1469
        echo -n "Docs "
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1470
        compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
2f85b948660b 8003844: build-infra: docs target isn't working properly
erikj
parents: 14458
diff changeset
  1471
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1472
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1473
        compare_general_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1474
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1475
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1476
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1477
        compare_general_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1478
    fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1479
    if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1480
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1481
        compare_general_files $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1482
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1483
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1484
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1485
if [ "$CMP_ZIPS" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1486
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1487
        compare_all_zip_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1488
    fi
15062
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15059
diff changeset
  1489
    if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15059
diff changeset
  1490
        if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15059
diff changeset
  1491
            echo "sec-bin.zip..."
15068
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1492
            compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1493
        fi
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1494
    fi
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1495
    if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1496
        if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1497
            echo "sec-windows-bin.zip..."
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1498
            compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1499
        fi
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1500
    fi
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1501
    if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1502
        if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1503
            echo "$JGSS_WINDOWS_BIN..."
4f8e8dd6e6d5 8005858: build-infra: Add missed comparison of sec-windows-bin.zip and friends to compare.sh
erikj
parents: 15063
diff changeset
  1504
            compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN
15062
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15059
diff changeset
  1505
        fi
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15059
diff changeset
  1506
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1507
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1508
        compare_all_zip_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1509
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1510
    if [ -n "$THIS_DEPLOY_BUNDLE_DIR" ] && [ -n "$OTHER_DEPLOY_BUNDLE_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1511
        compare_all_zip_files $THIS_DEPLOY_BUNDLE_DIR $OTHER_DEPLOY_BUNDLE_DIR $COMPARE_ROOT/deploy-bundle
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1512
    fi
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1513
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1514
        compare_all_zip_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1515
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1516
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1517
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1518
if [ "$CMP_JARS" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1519
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1520
        compare_all_jar_files $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1521
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1522
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1523
        compare_all_jar_files $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1524
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1525
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1526
        compare_all_jar_files $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1527
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1528
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1529
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1530
if [ "$CMP_LIBS" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1531
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1532
        echo -n "JDK "
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1533
        compare_all_libs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
14458
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
  1534
        if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1535
            echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1536
            compare_all_libs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
14458
8e22b637770a 8002026: build-infra: deploy repository building
tbell
parents: 14280
diff changeset
  1537
        fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1538
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1539
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1540
        compare_all_libs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1541
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1542
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1543
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1544
        compare_all_libs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1545
    fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1546
    if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1547
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1548
        compare_all_libs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1549
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1550
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1551
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1552
if [ "$CMP_EXECS" = "true" ]; then
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1553
    if [ -n "$THIS_JDK" ] && [ -n "$OTHER_JDK" ]; then
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1554
        compare_all_execs $THIS_JDK $OTHER_JDK $COMPARE_ROOT/jdk
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1555
        if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1556
            echo -n "JRE "
29157
e911c898c14c 8073965: Bring compare.sh up to date with JDK 9
erikj
parents: 28356
diff changeset
  1557
            compare_all_execs $THIS_JRE $OTHER_JRE $COMPARE_ROOT/jre
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1558
        fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1559
    fi
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1560
    if [ -n "$THIS_BASE_DIR" ] && [ -n "$OTHER_BASE_DIR" ]; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1561
        compare_all_execs $THIS_BASE_DIR $OTHER_BASE_DIR $COMPARE_ROOT/base_dir
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23428
diff changeset
  1562
    fi
28356
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1563
    if [ -n "$THIS_DEPLOY_APPLET_PLUGIN_DIR" ] && [ -n "$OTHER_DEPLOY_APPLET_PLUGIN_DIR" ]; then
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1564
        echo -n "JavaAppletPlugin "
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1565
        compare_all_execs $THIS_DEPLOY_APPLET_PLUGIN_DIR $OTHER_DEPLOY_APPLET_PLUGIN_DIR $COMPARE_ROOT/plugin
3b985eeacb08 8066769: Fix merge errors following JDK-8049367
ihse
parents: 27602
diff changeset
  1566
    fi
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1567
    if [ -n "$THIS_SPARKLE_DIR" ] && [ -n "$OTHER_SPARKLE_DIR" ]; then
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1568
        echo -n "Sparkle.framework "
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1569
        compare_all_execs $THIS_SPARKLE_DIR $OTHER_SPARKLE_DIR $COMPARE_ROOT/sparkle
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35370
diff changeset
  1570
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1571
fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1572
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1573
echo
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1574
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1575
if [ -n "$REGRESSIONS" ]; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1576
    echo "REGRESSIONS FOUND!"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1577
    echo
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1578
    exit 1
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1579
else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1580
    echo "No regressions found"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1581
    echo
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1582
    exit 0
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents:
diff changeset
  1583
fi