1383 echo "Also comparing install sparkle framework" |
1383 echo "Also comparing install sparkle framework" |
1384 echo " $THIS_SPARKLE_DIR" |
1384 echo " $THIS_SPARKLE_DIR" |
1385 echo " $OTHER_SPARKLE_DIR" |
1385 echo " $OTHER_SPARKLE_DIR" |
1386 fi |
1386 fi |
1387 |
1387 |
1388 if [ -d "$OTHER/images" ]; then |
1388 THIS_SEC_DIR="$THIS/images" |
1389 OTHER_SEC_DIR="$OTHER/images" |
1389 OTHER_SEC_DIR="$OTHER/images" |
1390 else |
1390 if [ -f "$THIS_SEC_DIR/sec-bin.zip" ] && [ -f "$OTHER_SEC_DIR/sec-bin.zip" ]; then |
1391 OTHER_SEC_DIR="$OTHER/tmp" |
|
1392 fi |
|
1393 if [ -f "$THIS_SEC_DIR/sec-bin.zip" ]; then |
|
1394 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" |
1391 OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" |
1395 THIS_SEC_DIR="$THIS/images" |
|
1396 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" |
1392 THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" |
1397 fi |
1393 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then |
1398 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then |
1394 if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then |
1399 if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then |
1395 JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" |
1400 JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" |
1396 else |
1401 else |
1397 JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" |
1402 JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" |
1398 fi |
1403 fi |
1399 OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" |
1404 OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" |
1400 OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" |
1405 OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" |
1401 THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" |
1406 THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" |
1402 THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" |
1407 THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" |
1403 fi |
1408 fi |
1404 fi |
1409 |
1405 |
1410 if [ -d "$THIS/images/docs" ] && [ -d "$OTHER/images/docs" ]; then |
1406 if [ -d "$THIS/images/docs" ] && [ -d "$OTHER/images/docs" ]; then |
1411 THIS_DOCS="$THIS/images/docs" |
1407 THIS_DOCS="$THIS/images/docs" |
1412 OTHER_DOCS="$OTHER/images/docs" |
1408 OTHER_DOCS="$OTHER/images/docs" |