Mercurial > jdk8-mips64-public / file comparison
comparison: common/bin/compare.sh
common/bin/compare.sh
- changeset 569
- 2597feac57c0
- parent 568
- 7b9c42f14281
- child 574
- db3984e4eb97
equal
deleted
inserted
replaced
| 568:7b9c42f14281 | 569:2597feac57c0 |
|---|---|
| 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 | 1169 if [ -d "$OTHER/images" ]; then |
| 1170 OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip" | 1170 OTHER_SEC_DIR="$OTHER/images" |
| 1171 elif [ -f "$OTHER/images/sec-bin.zip" ]; then | |
| 1172 OTHER_SEC_BIN="$OTHER/tmp/sec-bin.zip" | |
| 1173 else | 1171 else |
| 1174 echo "WARNING! No sec-bin.zip found in other." | 1172 OTHER_SEC_DIR="$OTHER/tmp" |
| 1175 fi | 1173 fi |
| 1176 THIS_SEC_BIN="$THIS/images/sec-bin.zip" | 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 | |
| 1177 | 1188 |
| 1178 ########################################################################################## | 1189 ########################################################################################## |
| 1179 # Do the work | 1190 # Do the work |
| 1180 | 1191 |
| 1181 if [ "$CMP_NAMES" = "true" ]; then | 1192 if [ "$CMP_NAMES" = "true" ]; then |
