equal
deleted
inserted
replaced
1164 |
1164 |
1165 if [ -z "$OTHER_DOCS" ]; then |
1165 if [ -z "$OTHER_DOCS" ]; then |
1166 echo "WARNING! Other build doesn't contain docs, skipping doc compare." |
1166 echo "WARNING! Other build doesn't contain docs, skipping doc compare." |
1167 fi |
1167 fi |
1168 |
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 |
1169 ########################################################################################## |
1178 ########################################################################################## |
1170 # Do the work |
1179 # Do the work |
1171 |
1180 |
1172 if [ "$CMP_NAMES" = "true" ]; then |
1181 if [ "$CMP_NAMES" = "true" ]; then |
1173 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then |
1182 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then |
1280 |
1289 |
1281 if [ "$CMP_ZIPS" = "true" ]; then |
1290 if [ "$CMP_ZIPS" = "true" ]; then |
1282 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then |
1291 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then |
1283 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk |
1292 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk |
1284 fi |
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 |
1285 fi |
1300 fi |
1286 |
1301 |
1287 if [ "$CMP_JARS" = "true" ]; then |
1302 if [ "$CMP_JARS" = "true" ]; then |
1288 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then |
1303 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then |
1289 compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk |
1304 compare_all_jar_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk |