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 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 "




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 [ -d "$OTHER/images" ]; then
1170     OTHER_SEC_DIR="$OTHER/images"


1171 else
1172     OTHER_SEC_DIR="$OTHER/tmp"
1173 fi
1174 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip"
1175 THIS_SEC_DIR="$THIS/images"
1176 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip"
1177 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
1178     if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then
1179         JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip"
1180     else
1181         JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip"
1182     fi
1183     OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip"
1184     OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN"
1185     THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip"
1186     THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN"
1187 fi

1188 
1189 ##########################################################################################
1190 # Do the work
1191 
1192 if [ "$CMP_NAMES" = "true" ]; then
1193     if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then
1194         echo -n "J2SDK "
1195         compare_dirs $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1196         echo -n "J2RE  "
1197         compare_dirs $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1198         
1199         echo -n "J2SDK "
1200         compare_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk
1201         echo -n "J2RE  "
1202         compare_files $THIS_J2RE $OTHER_J2RE $COMPARE_ROOT/j2re
1203     fi
1204     if [ -n "$THIS_J2SDK_OVERLAY" ] && [ -n "$OTHER_J2SDK_OVERLAY" ]; then
1205         echo -n "J2SDK Overlay "
1206         compare_dirs $THIS_J2SDK_OVERLAY $OTHER_J2SDK_OVERLAY $COMPARE_ROOT/j2sdk-overlay
1207         echo -n "J2RE  Overlay "