652 if [ "$NAME" = "java.exe" ] \ |
652 if [ "$NAME" = "java.exe" ] \ |
653 && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then |
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" |
654 OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz" |
655 elif [ "$NAME" = "jimage.exe" ] \ |
655 elif [ "$NAME" = "jimage.exe" ] \ |
656 && [ -f "$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then |
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" |
657 OTHER_DIZ_FILE="$OTHER/support/modules_cmds/jdk.jlink/jimage.diz" |
658 elif [ "$NAME" = "javacpl.exe" ] \ |
658 elif [ "$NAME" = "javacpl.exe" ] \ |
659 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then |
659 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then |
660 OTHER_DIZ_FILE="$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" |
660 OTHER_DIZ_FILE="$OTHER/support/modules_cmds/jdk.deploy.controlpanel/javacpl.diz" |
661 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then |
661 elif [ -f "${OTHER_FILE_BASE}.diz" ]; then |
662 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz |
662 OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz |
663 else |
663 else |
664 # Some files, jli.dll, appears twice in the image but only one of |
664 # Some files, jli.dll, appears twice in the image but only one of |
665 # them has a diz file next to it. |
665 # them has a diz file next to it. |
684 if [ "$NAME" = "java.exe" ] \ |
684 if [ "$NAME" = "java.exe" ] \ |
685 && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then |
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" |
686 THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz" |
687 elif [ "$NAME" = "jimage.exe" ] \ |
687 elif [ "$NAME" = "jimage.exe" ] \ |
688 && [ -f "$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then |
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" |
689 THIS_DIZ_FILE="$THIS/support/modules_cmds/jdk.jlink/jimage.diz" |
690 elif [ "$NAME" = "javacpl.exe" ] \ |
690 elif [ "$NAME" = "javacpl.exe" ] \ |
691 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then |
691 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then |
692 THIS_DIZ_FILE="$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" |
692 THIS_DIZ_FILE="$THIS/support/modules_cmds/jdk.deploy.controlpanel/javacpl.diz" |
693 elif [ -f "${THIS_FILE_BASE}.diz" ]; then |
693 elif [ -f "${THIS_FILE_BASE}.diz" ]; then |
694 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz |
694 THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz |
695 else |
695 else |
696 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" |
696 THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)" |
697 if [ ! -f "$THIS_DIZ_FILE" ]; then |
697 if [ ! -f "$THIS_DIZ_FILE" ]; then |