1186 THIS_JDK="$THIS/install/jdk" |
1186 THIS_JDK="$THIS/install/jdk" |
1187 THIS_JRE="$THIS/install/jre" |
1187 THIS_JRE="$THIS/install/jre" |
1188 OTHER_JDK="$OTHER/install/jdk" |
1188 OTHER_JDK="$OTHER/install/jdk" |
1189 OTHER_JRE="$OTHER/install/jre" |
1189 OTHER_JRE="$OTHER/install/jre" |
1190 echo "Selecting install images for compare" |
1190 echo "Selecting install images for compare" |
1191 elif [ -d "$THIS/deploy/jdk" -o -d "$THIS/deploy/images/jdk" ] \ |
1191 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/deploy/images/jdk" ]; then |
1192 && [ -d "$OTHER/deploy/jdk" -o -d "$OTHER/deploy/images/jdk" ]; then |
1192 THIS_JDK="$THIS/images/jdk" |
1193 if [ -d "$THIS/deploy/images/jdk" ]; then |
1193 THIS_JRE="$THIS/images/jre" |
1194 THIS_JDK="$THIS/deploy/images/jdk" |
1194 OTHER_JDK="$OTHER/deploy/images/jdk" |
1195 THIS_JRE="$THIS/deploy/images/jre" |
1195 OTHER_JRE="$OTHER/deploy/images/jre" |
1196 else |
|
1197 THIS_JDK="$THIS/deploy/jdk" |
|
1198 THIS_JRE="$THIS/deploy/jre" |
|
1199 fi |
|
1200 if [ -d "$OTHER/deploy/images/jdk" ]; then |
|
1201 OTHER_JDK="$OTHER/deploy/images/jdk" |
|
1202 OTHER_JRE="$OTHER/deploy/images/jre" |
|
1203 else |
|
1204 OTHER_JDK="$OTHER/deploy/jdk" |
|
1205 OTHER_JRE="$OTHER/deploy/jre" |
|
1206 fi |
|
1207 echo "Selecting deploy images for compare" |
|
1208 elif [ -d "$THIS/deploy/images/jdk" ] && [ -d "$OTHER/deploy/jdk" ]; then |
|
1209 THIS_JDK="$THIS/deploy/jdk" |
|
1210 THIS_JRE="$THIS/deploy/jre" |
|
1211 OTHER_JDK="$OTHER/deploy/jdk" |
|
1212 OTHER_JRE="$OTHER/deploy/jre" |
|
1213 echo "Selecting deploy images for compare" |
1196 echo "Selecting deploy images for compare" |
1214 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then |
1197 elif [ -d "$THIS/images/jdk" ] && [ -d "$OTHER/images/jdk" ]; then |
1215 THIS_JDK="$THIS/images/jdk" |
1198 THIS_JDK="$THIS/images/jdk" |
1216 THIS_JRE="$THIS/images/jre" |
1199 THIS_JRE="$THIS/images/jre" |
1217 OTHER_JDK="$OTHER/images/jdk" |
1200 OTHER_JDK="$OTHER/images/jdk" |
1219 echo "Selecting jdk images for compare" |
1202 echo "Selecting jdk images for compare" |
1220 else |
1203 else |
1221 echo "No common images found." |
1204 echo "No common images found." |
1222 exit 1 |
1205 exit 1 |
1223 fi |
1206 fi |
1224 |
1207 echo " $THIS_JDK" |
1225 if [ -d "$THIS/deploy/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \ |
1208 echo " $OTHER_JDK" |
1226 && [ -d "$OTHER/deploy/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then |
1209 |
|
1210 if [ -d "$THIS/images/jdk-bundle" -o -d "$THIS/deploy/images/jdk-bundle" ] \ |
|
1211 && [ -d "$OTHER/images/jdk-bundle" -o -d "$OTHER/deploy/images/jdk-bundle" ]; then |
1227 if [ -d "$THIS/deploy/images/jdk-bundle" ]; then |
1212 if [ -d "$THIS/deploy/images/jdk-bundle" ]; then |
1228 THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle" |
1213 THIS_JDK_BUNDLE="$THIS/deploy/images/jdk-bundle" |
1229 THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle" |
1214 THIS_JRE_BUNDLE="$THIS/deploy/images/jre-bundle" |
1230 else |
1215 else |
1231 THIS_JDK_BUNDLE="$THIS/deploy/jdk-bundle" |
1216 THIS_JDK_BUNDLE="$THIS/images/jdk-bundle" |
1232 THIS_JRE_BUNDLE="$THIS/deploy/jre-bundle" |
1217 THIS_JRE_BUNDLE="$THIS/images/jre-bundle" |
1233 fi |
1218 fi |
1234 if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then |
1219 if [ -d "$OTHER/deploy/images/jdk-bundle" ]; then |
1235 OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle" |
1220 OTHER_JDK_BUNDLE="$OTHER/deploy/images/jdk-bundle" |
1236 OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle" |
1221 OTHER_JRE_BUNDLE="$OTHER/deploy/images/jre-bundle" |
1237 else |
1222 else |
1238 OTHER_JDK_BUNDLE="$OTHER/deploy/jdk-bundle" |
1223 OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle" |
1239 OTHER_JRE_BUNDLE="$OTHER/deploy/jre-bundle" |
1224 OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle" |
1240 fi |
1225 fi |
1241 echo "Also comparing deploy macosx bundles" |
|
1242 elif [ -d "$THIS/images/jdk-bundle" ] && [ -d "$OTHER/images/jdk-bundle" ]; then |
|
1243 THIS_JDK_BUNDLE="$THIS/images/jdk-bundle" |
|
1244 THIS_JRE_BUNDLE="$THIS/images/jre-bundle" |
|
1245 OTHER_JDK_BUNDLE="$OTHER/images/jdk-bundle" |
|
1246 OTHER_JRE_BUNDLE="$OTHER/images/jre-bundle" |
|
1247 echo "Also comparing macosx bundles" |
1226 echo "Also comparing macosx bundles" |
|
1227 echo " $THIS_JDK_BUNDLE" |
|
1228 echo " $OTHER_JDK_BUNDLE" |
1248 fi |
1229 fi |
1249 |
1230 |
1250 if [ -d "$THIS/deploy/bundles" -o -d "$THIS/deploy/images/bundles" ] \ |
1231 if [ -d "$THIS/deploy/bundles" -o -d "$THIS/deploy/images/bundles" ] \ |
1251 && [ -d "$OTHER/deploy/bundles" -o -d "$OTHER/deploy/images/bundles" ]; then |
1232 && [ -d "$OTHER/deploy/bundles" -o -d "$OTHER/deploy/images/bundles" ]; then |
1252 if [ -d "$THIS/deploy/images/bundles" ]; then |
1233 if [ -d "$THIS/deploy/images/bundles" ]; then |
1260 OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles" |
1241 OTHER_DEPLOY_BUNDLE_DIR="$OTHER/deploy/bundles" |
1261 fi |
1242 fi |
1262 echo "Also comparing deploy javadoc bundles" |
1243 echo "Also comparing deploy javadoc bundles" |
1263 fi |
1244 fi |
1264 |
1245 |
1265 if [ -d "$THIS/deploy/JavaAppletPlugin.plugin" -o -d "$THIS/deploy/images/JavaAppletPlugin.plugin" ] \ |
1246 if [ -d "$THIS/images/JavaAppletPlugin.plugin" ] \ |
1266 && [ -d "$OTHER/deploy/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then |
1247 && [ -d "$OTHER/images/JavaAppletPlugin.plugin" -o -d "$OTHER/deploy/images/JavaAppletPlugin.plugin" ]; then |
1267 if [ -d "$THIS/deploy/images/bundles" ]; then |
1248 if [ -d "$THIS/images/JavaAppletPlugin.plugin" ]; then |
|
1249 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/images/JavaAppletPlugin.plugin" |
|
1250 else |
1268 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin" |
1251 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/images/JavaAppletPlugin.plugin" |
|
1252 fi |
|
1253 if [ -d "$OTHER/images/JavaAppletPlugin.plugin" ]; then |
|
1254 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/images/JavaAppletPlugin.plugin" |
1269 else |
1255 else |
1270 THIS_DEPLOY_APPLET_PLUGIN_DIR="$THIS/deploy/JavaAppletPlugin.plugin" |
|
1271 fi |
|
1272 if [ -d "$OTHER/deploy/images/bundles" ]; then |
|
1273 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin" |
1256 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/images/JavaAppletPlugin.plugin" |
1274 else |
|
1275 OTHER_DEPLOY_APPLET_PLUGIN_DIR="$OTHER/deploy/JavaAppletPlugin.plugin" |
|
1276 fi |
1257 fi |
1277 echo "Also comparing deploy applet image" |
1258 echo "Also comparing deploy applet image" |
|
1259 echo " $THIS_DEPLOY_APPLET_PLUGIN_DIR" |
|
1260 echo " $OTHER_DEPLOY_APPLET_PLUGIN_DIR" |
1278 fi |
1261 fi |
1279 |
1262 |
1280 if [ -d "$OTHER/images" ]; then |
1263 if [ -d "$OTHER/images" ]; then |
1281 OTHER_SEC_DIR="$OTHER/images" |
1264 OTHER_SEC_DIR="$OTHER/images" |
1282 else |
1265 else |