1.1 --- a/common/bin/compare.sh Thu Nov 07 08:16:05 2013 -0800
1.2 +++ b/common/bin/compare.sh Thu Nov 14 10:53:23 2013 +0100
1.3 @@ -1113,14 +1113,15 @@
1.4 if [ -d "$THIS/install/j2sdk-image" ]; then
1.5 THIS_J2SDK="$THIS/install/j2sdk-image"
1.6 THIS_J2RE="$THIS/install/j2re-image"
1.7 - echo "Comparing install images"
1.8 + echo "Selecting install images in this build"
1.9 elif [ -d "$THIS/deploy/j2sdk-image" ]; then
1.10 THIS_J2SDK="$THIS/deploy/j2sdk-image"
1.11 THIS_J2RE="$THIS/deploy/j2re-image"
1.12 - echo "Comparing deploy images"
1.13 + echo "Selecting deploy images in this build"
1.14 elif [ -d "$THIS/images/j2sdk-image" ]; then
1.15 THIS_J2SDK="$THIS/images/j2sdk-image"
1.16 THIS_J2RE="$THIS/images/j2re-image"
1.17 + echo "Selecting jdk images in this build"
1.18 fi
1.19
1.20 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
1.21 @@ -1128,15 +1129,18 @@
1.22 # If there is an install image, prefer that, it's also overlay
1.23 THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
1.24 THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
1.25 + echo "Selecting install overlay images in this build"
1.26 else
1.27 THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
1.28 THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
1.29 + echo "Selecting jdk overlay images in this build"
1.30 fi
1.31 fi
1.32
1.33 if [ -d "$THIS/images/j2sdk-bundle" ]; then
1.34 THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
1.35 THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
1.36 + echo "Selecting bundles in this build"
1.37 fi
1.38
1.39 # Figure out the layout of the other build (old or new, normal or overlay image)
1.40 @@ -1144,21 +1148,34 @@
1.41 if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
1.42 OTHER_J2SDK="$OTHER/j2sdk-image"
1.43 OTHER_J2RE="$OTHER/j2re-image"
1.44 + echo "Selecting old-style images in other build"
1.45 else
1.46 OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
1.47 OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
1.48 + echo "Selecting overlay images in other build"
1.49 fi
1.50 +elif [ -d "$OTHER/install/j2sdk-image" ]; then
1.51 + OTHER_J2SDK="$OTHER/install/j2sdk-image"
1.52 + OTHER_J2RE="$OTHER/install/j2re-image"
1.53 + echo "Selecting install images in other build"
1.54 +elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
1.55 + OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
1.56 + OTHER_J2RE="$OTHER/deploy/j2re-image"
1.57 + echo "Selecting deploy images in other build"
1.58 elif [ -d "$OTHER/images/j2sdk-image" ]; then
1.59 OTHER_J2SDK="$OTHER/images/j2sdk-image"
1.60 OTHER_J2RE="$OTHER/images/j2re-image"
1.61 + echo "Selecting jdk images in other build"
1.62 fi
1.63
1.64 if [ -d "$OTHER/j2sdk-bundle" ]; then
1.65 OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
1.66 OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
1.67 + echo "Selecting bundles in other build"
1.68 elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
1.69 OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
1.70 OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
1.71 + echo "Selecting jdk bundles in other build"
1.72 fi
1.73
1.74 if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
