common/bin/compare.sh

changeset 510
a2df4ee40ecb
parent 502
ed9e5635fc80
child 518
6ff2e1280dc3
equal deleted inserted replaced
507:f2ac4d0edaae 510:a2df4ee40ecb
281 281
282 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \ 282 GENERAL_FILES=$(cd $THIS_DIR && $FIND . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \
283 ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \ 283 ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \
284 ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \ 284 ! -name "ct.sym" ! -name "*.diz" ! -name "*.dll" \
285 ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \ 285 ! -name "*.pdb" ! -name "*.exp" ! -name "*.ilk" \
286 ! -name "*.lib" ! -name "*.war" \ 286 ! -name "*.lib" ! -name "*.war" ! -name "JavaControlPanel" \
287 | $GREP -v "./bin/" | $SORT | $FILTER) 287 | $GREP -v "./bin/" | $SORT | $FILTER)
288 288
289 echo General files... 289 echo General files...
290 for f in $GENERAL_FILES 290 for f in $GENERAL_FILES
291 do 291 do
609 fi 609 fi
610 if [ $THIS_SIZE -ne $OTHER_SIZE ]; then 610 if [ $THIS_SIZE -ne $OTHER_SIZE ]; then
611 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE) 611 DIFF_SIZE_NUM=$($EXPR $THIS_SIZE - $OTHER_SIZE)
612 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE) 612 DIFF_SIZE_REL=$($EXPR $THIS_SIZE \* 100 / $OTHER_SIZE)
613 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM) 613 SIZE_MSG=$($PRINTF "%3d%% %4d" $DIFF_SIZE_REL $DIFF_SIZE_NUM)
614 if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] && [ "$DIFF_SIZE_REL" -lt 102 ]; then 614 if [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_REL" -gt 98 ] \
615 && [ "$DIFF_SIZE_REL" -lt 102 ]; then
615 SIZE_MSG="($SIZE_MSG)" 616 SIZE_MSG="($SIZE_MSG)"
616 DIFF_SIZE= 617 DIFF_SIZE=
617 elif [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] && [ "$DIFF_SIZE_NUM" = 512 ]; then 618 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
619 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
620 && [ "$DIFF_SIZE_NUM" = 512 ]; then
621 # On windows, size of binaries increase in 512 increments.
622 SIZE_MSG="($SIZE_MSG)"
623 DIFF_SIZE=
624 elif [ "$OPENJDK_TARGET_OS" = "windows" ] \
625 && [[ "$ACCEPTED_SMALL_SIZE_DIFF" = *"$BIN_FILE"* ]] \
626 && [ "$DIFF_SIZE_NUM" = -512 ]; then
618 # On windows, size of binaries increase in 512 increments. 627 # On windows, size of binaries increase in 512 increments.
619 SIZE_MSG="($SIZE_MSG)" 628 SIZE_MSG="($SIZE_MSG)"
620 DIFF_SIZE= 629 DIFF_SIZE=
621 else 630 else
622 if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then 631 if [[ "$ACCEPTED_SIZE_DIFF" != *"$BIN_FILE"* ]]; then
838 compare_all_libs() { 847 compare_all_libs() {
839 THIS_DIR=$1 848 THIS_DIR=$1
840 OTHER_DIR=$2 849 OTHER_DIR=$2
841 WORK_DIR=$3 850 WORK_DIR=$3
842 851
843 LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' \) | $SORT | $FILTER) 852 LIBS=$(cd $THIS_DIR && $FIND . -type f \( -name 'lib*.so' -o -name '*.dylib' -o -name '*.dll' -o -name 'JavaControlPanel' \) | $SORT | $FILTER)
844 853
845 if [ -n "$LIBS" ]; then 854 if [ -n "$LIBS" ]; then
846 echo Libraries... 855 echo Libraries...
847 print_binary_diff_header 856 print_binary_diff_header
848 for l in $LIBS; do 857 for l in $LIBS; do
1216 fi 1225 fi
1217 fi 1226 fi
1218 1227
1219 if [ "$CMP_LIBS" = "true" ]; then 1228 if [ "$CMP_LIBS" = "true" ]; then
1220 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 1229 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1230 echo -n "J2SDK "
1221 compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 1231 compare_all_libs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1232 if [ "$OPENJDK_TARGET_OS" = "macosx" ]; then
1233 echo -n "J2RE "
1234 compare_all_libs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1235 fi
1222 fi 1236 fi
1223 if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then 1237 if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1224 echo -n "Bundle " 1238 echo -n "Bundle "
1225 compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay 1239 compare_all_libs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1226 fi 1240 fi

mercurial