637 $STRIP $THIS_STRIPPED_FILE 638 $STRIP $OTHER_STRIPPED_FILE 639 THIS_FILE="$THIS_STRIPPED_FILE" 640 OTHER_FILE="$OTHER_STRIPPED_FILE" 641 fi 642 643 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 644 unset _NT_SYMBOL_PATH 645 # On windows we need to unzip the debug symbols, if present 646 OTHER_FILE_BASE=${OTHER_FILE/.dll/} 647 OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/} 648 OTHER_FILE_BASE=${OTHER_FILE_BASE/.cpl/} 649 DIZ_NAME=$(basename $OTHER_FILE_BASE).diz 650 # Some .exe files have the same name as a .dll file. Make sure the exe 651 # files get the right debug symbols. 652 if [ "$NAME" = "java.exe" ] \ 653 && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then 654 OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz" 655 elif [ "$NAME" = "jimage.exe" ] \ 656 && [ -f "$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then 657 OTHER_DIZ_FILE="$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz" 658 elif [ "$NAME" = "javacpl.exe" ] \ 659 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then 660 OTHER_DIZ_FILE="$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" 661 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then 662 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz 663 else 664 # Some files, jli.dll, appears twice in the image but only one of 665 # them has a diz file next to it. 666 OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)" 667 if [ ! -f "$OTHER_DIZ_FILE" ]; then 668 # As a last resort, look for diz file in the whole build output 669 # dir. 670 OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)" 671 fi 672 fi 673 if [ -n "$OTHER_DIZ_FILE" ]; then 674 $MKDIR -p $FILE_WORK_DIR/other 675 (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE) 676 export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other" 677 fi 678 679 THIS_FILE_BASE=${THIS_FILE/.dll/} 680 THIS_FILE_BASE=${THIS_FILE_BASE/.exe/} 681 THIS_FILE_BASE=${THIS_FILE_BASE/.cpl/} 682 # Some .exe files have the same name as a .dll file. Make sure the exe 683 # files get the right debug symbols. 684 if [ "$NAME" = "java.exe" ] \ 685 && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then 686 THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz" 687 elif [ "$NAME" = "jimage.exe" ] \ 688 && [ -f "$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then 689 THIS_DIZ_FILE="$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz" 690 elif [ "$NAME" = "javacpl.exe" ] \ 691 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then 692 THIS_DIZ_FILE="$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" 693 elif [ -f "${THIS_FILE_BASE}.diz" ]; then 694 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz 695 else 696 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" 697 if [ ! -f "$THIS_DIZ_FILE" ]; then 698 # As a last resort, look for diz file in the whole build output 699 # dir. 700 THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)" 701 fi 702 fi 703 if [ -n "$THIS_DIZ_FILE" ]; then 704 $MKDIR -p $FILE_WORK_DIR/this 705 (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE) 706 export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this" 707 fi 708 fi 709 710 if [ -z "$SKIP_BIN_DIFF" ]; then 711 if cmp $OTHER_FILE $THIS_FILE > /dev/null; then 712 # The files were bytewise identical. | 637 $STRIP $THIS_STRIPPED_FILE 638 $STRIP $OTHER_STRIPPED_FILE 639 THIS_FILE="$THIS_STRIPPED_FILE" 640 OTHER_FILE="$OTHER_STRIPPED_FILE" 641 fi 642 643 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 644 unset _NT_SYMBOL_PATH 645 # On windows we need to unzip the debug symbols, if present 646 OTHER_FILE_BASE=${OTHER_FILE/.dll/} 647 OTHER_FILE_BASE=${OTHER_FILE_BASE/.exe/} 648 OTHER_FILE_BASE=${OTHER_FILE_BASE/.cpl/} 649 DIZ_NAME=$(basename $OTHER_FILE_BASE).diz 650 # Some .exe files have the same name as a .dll file. Make sure the exe 651 # files get the right debug symbols. 652 if [ "$NAME" = "java.exe" ] \ 653 && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then 654 OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz" 655 elif [ "$NAME" = "jimage.exe" ] \ 656 && [ -f "$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then 657 OTHER_DIZ_FILE="$OTHER/support/modules_cmds/jdk.jlink/jimage.diz" 658 elif [ "$NAME" = "javacpl.exe" ] \ 659 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then 660 OTHER_DIZ_FILE="$OTHER/support/modules_cmds/jdk.deploy.controlpanel/javacpl.diz" 661 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then 662 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz 663 else 664 # Some files, jli.dll, appears twice in the image but only one of 665 # them has a diz file next to it. 666 OTHER_DIZ_FILE="$($FIND $OTHER_DIR -name $DIZ_NAME | $SED 1q)" 667 if [ ! -f "$OTHER_DIZ_FILE" ]; then 668 # As a last resort, look for diz file in the whole build output 669 # dir. 670 OTHER_DIZ_FILE="$($FIND $OTHER -name $DIZ_NAME | $SED 1q)" 671 fi 672 fi 673 if [ -n "$OTHER_DIZ_FILE" ]; then 674 $MKDIR -p $FILE_WORK_DIR/other 675 (cd $FILE_WORK_DIR/other ; $UNARCHIVE -o $OTHER_DIZ_FILE) 676 export _NT_SYMBOL_PATH="$FILE_WORK_DIR/other" 677 fi 678 679 THIS_FILE_BASE=${THIS_FILE/.dll/} 680 THIS_FILE_BASE=${THIS_FILE_BASE/.exe/} 681 THIS_FILE_BASE=${THIS_FILE_BASE/.cpl/} 682 # Some .exe files have the same name as a .dll file. Make sure the exe 683 # files get the right debug symbols. 684 if [ "$NAME" = "java.exe" ] \ 685 && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then 686 THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz" 687 elif [ "$NAME" = "jimage.exe" ] \ 688 && [ -f "$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then 689 THIS_DIZ_FILE="$THIS/support/modules_cmds/jdk.jlink/jimage.diz" 690 elif [ "$NAME" = "javacpl.exe" ] \ 691 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then 692 THIS_DIZ_FILE="$THIS/support/modules_cmds/jdk.deploy.controlpanel/javacpl.diz" 693 elif [ -f "${THIS_FILE_BASE}.diz" ]; then 694 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz 695 else 696 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" 697 if [ ! -f "$THIS_DIZ_FILE" ]; then 698 # As a last resort, look for diz file in the whole build output 699 # dir. 700 THIS_DIZ_FILE="$($FIND $THIS -name $DIZ_NAME | $SED 1q)" 701 fi 702 fi 703 if [ -n "$THIS_DIZ_FILE" ]; then 704 $MKDIR -p $FILE_WORK_DIR/this 705 (cd $FILE_WORK_DIR/this ; $UNARCHIVE -o $THIS_DIZ_FILE) 706 export _NT_SYMBOL_PATH="$_NT_SYMBOL_PATH;$FILE_WORK_DIR/this" 707 fi 708 fi 709 710 if [ -z "$SKIP_BIN_DIFF" ]; then 711 if cmp $OTHER_FILE $THIS_FILE > /dev/null; then 712 # The files were bytewise identical. |