common/bin/compare.sh

Print this page




1149     echo "WARNING! OTHER build has bundles built while this build does not."
1150     echo "Skipping bundle compare!"
1151 fi
1152 
1153 if [ -d "$THIS/docs" ]; then
1154     THIS_DOCS="$THIS/docs"
1155 fi
1156 
1157 if [ -d "$OTHER/docs" ]; then
1158     OTHER_DOCS="$OTHER/docs"
1159 fi
1160 
1161 if [ -z "$THIS_DOCS" ]; then
1162     echo "WARNING! Docs haven't been built and won't be compared."
1163 fi
1164 
1165 if [ -z "$OTHER_DOCS" ]; then
1166     echo "WARNING! Other build doesn't contain docs, skipping doc compare."
1167 fi
1168 









1169 ##########################################################################################
1170 # Do the work
1171 
1172 if [ "$CMP_NAMES" = "true" ]; then
1173     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1174         echo -n "J2SDK "
1175         compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1176         echo -n "J2RE  "
1177         compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1178         
1179         echo -n "J2SDK "
1180         compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1181         echo -n "J2RE  "
1182         compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1183     fi
1184     if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1185         echo -n "J2SDK Overlay "
1186         compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1187         echo -n "J2RE  Overlay "
1188         compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay


1264         echo -n "J2SDK Overlay "
1265         compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1266         echo -n "J2RE  Overlay "
1267         compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1268     fi
1269     if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1270         echo -n "J2SDK Bundle "
1271         compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1272         echo -n "J2RE  Bundle "
1273         compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1274     fi
1275     if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
1276         echo -n "Docs "
1277         compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
1278     fi
1279 fi
1280 
1281 if [ "$CMP_ZIPS" = "true" ]; then
1282     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1283         compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk






1284     fi
1285 fi
1286 
1287 if [ "$CMP_JARS" = "true" ]; then
1288     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1289         compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1290     fi
1291 fi
1292 
1293 if [ "$CMP_LIBS" = "true" ]; then
1294     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1295         echo -n "J2SDK "
1296         compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1297         if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
1298             echo -n "J2RE  "
1299             compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1300         fi
1301     fi
1302     if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1303         echo -n "Bundle   "




1149     echo "WARNING! OTHER build has bundles built while this build does not."
1150     echo "Skipping bundle compare!"
1151 fi
1152 
1153 if [ -d "$THIS/docs" ]; then
1154     THIS_DOCS="$THIS/docs"
1155 fi
1156 
1157 if [ -d "$OTHER/docs" ]; then
1158     OTHER_DOCS="$OTHER/docs"
1159 fi
1160 
1161 if [ -z "$THIS_DOCS" ]; then
1162     echo "WARNING! Docs haven't been built and won't be compared."
1163 fi
1164 
1165 if [ -z "$OTHER_DOCS" ]; then
1166     echo "WARNING! Other build doesn't contain docs, skipping doc compare."
1167 fi
1168 
1169 if [ -f "$OTHER/tmp/sec-bin.zip" ]; then
1170     OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
1171 elif [ -f "$OTHER/images/sec-bin.zip" ]; then
1172     OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip"
1173 else
1174     echo "WARNING! No sec-bin.zip found in other."
1175 fi
1176 THIS_SEC_BIN="$THIS/images/sec-bin.zip"
1177 
1178 ##########################################################################################
1179 # Do the work
1180 
1181 if [ "$CMP_NAMES" = "true" ]; then
1182     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1183         echo -n "J2SDK "
1184         compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1185         echo -n "J2RE  "
1186         compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1187         
1188         echo -n "J2SDK "
1189         compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1190         echo -n "J2RE  "
1191         compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1192     fi
1193     if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1194         echo -n "J2SDK Overlay "
1195         compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1196         echo -n "J2RE  Overlay "
1197         compare_dirs $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay


1273         echo -n "J2SDK Overlay "
1274         compare_general_files $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1275         echo -n "J2RE  Overlay "
1276         compare_general_files $THIS_J2RE_OVERLAY $OTHER_J2RE_OVERLAY $COMPARE_ROOT/j2re-overlay
1277     fi
1278     if [ -n "$THIS_J2SDK_BUNDLE" ] && [ -n "$OTHER_J2SDK_BUNDLE" ]; then
1279         echo -n "J2SDK Bundle "
1280         compare_general_files $THIS_J2SDK_BUNDLE $OTHER_J2SDK_BUNDLE $COMPARE_ROOT/j2sdk-bundle
1281         echo -n "J2RE  Bundle "
1282         compare_general_files $THIS_J2RE_BUNDLE $OTHER_J2RE_BUNDLE $COMPARE_ROOT/j2re-bundle
1283     fi
1284     if [ -n "$THIS_DOCS" ] && [ -n "$OTHER_DOCS" ]; then
1285         echo -n "Docs "
1286         compare_general_files $THIS_DOCS $OTHER_DOCS $COMPARE_ROOT/docs
1287     fi
1288 fi
1289 
1290 if [ "$CMP_ZIPS" = "true" ]; then
1291     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1292         compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1293     fi
1294     if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then
1295         if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then
1296             echo "sec-bin.zip..."
1297             compare_zip_file $(dirname $THIS_SEC_BIN) $(dirname $OTHER_SEC_BIN) $COMPARE_ROOT/sec-bin sec-bin.zip
1298         fi
1299     fi
1300 fi
1301 
1302 if [ "$CMP_JARS" = "true" ]; then
1303     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1304         compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1305     fi
1306 fi
1307 
1308 if [ "$CMP_LIBS" = "true" ]; then
1309     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1310         echo -n "J2SDK "
1311         compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1312         if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
1313             echo -n "J2RE  "
1314             compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1315         fi
1316     fi
1317     if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1318         echo -n "Bundle   "