standardize jdk name;
authorwenzelm
Thu Sep 05 16:39:01 2013 +0200 (2013-09-05)
changeset 53418d47a7cebe6b2
parent 53417 32ec957e5c3e
child 53419 1c87e79bb838
standardize jdk name;
check tar errors;
Admin/lib/Tools/makedist_bundle
     1.1 --- a/Admin/lib/Tools/makedist_bundle	Thu Sep 05 16:03:44 2013 +0200
     1.2 +++ b/Admin/lib/Tools/makedist_bundle	Thu Sep 05 16:39:01 2013 +0200
     1.3 @@ -48,7 +48,7 @@
     1.4  
     1.5  ISABELLE_TARGET="$TMP/$ISABELLE_NAME"
     1.6  
     1.7 -tar -C "$TMP" -x -z -f "$ARCHIVE"
     1.8 +tar -C "$TMP" -x -z -f "$ARCHIVE" || exit 2
     1.9  
    1.10  
    1.11  # bundled components
    1.12 @@ -83,10 +83,18 @@
    1.13                    perl -e "exit((stat('${CONTRIB}'))[7] == 0 ? 0 : 1);" && exit 2
    1.14                  fi
    1.15  
    1.16 -                tar -C "$ISABELLE_TARGET/contrib" -x -z -f "$CONTRIB"
    1.17 +                tar -C "$ISABELLE_TARGET/contrib" -x -z -f "$CONTRIB" || exit 2
    1.18                  if [ -f "$COMPONENT_DIR/etc/settings" -o -f "$COMPONENT_DIR/etc/components" ]
    1.19                  then
    1.20 -                  echo "contrib/$COMPONENT" >> "$ISABELLE_TARGET/etc/components"
    1.21 +                  case "$COMPONENT" in
    1.22 +                    jdk-*)
    1.23 +                      mv "$ISABELLE_TARGET/contrib/$COMPONENT" "$ISABELLE_TARGET/contrib/jdk"
    1.24 +                      echo "contrib/jdk" >> "$ISABELLE_TARGET/etc/components"
    1.25 +                      ;;
    1.26 +                    *)
    1.27 +                      echo "contrib/$COMPONENT" >> "$ISABELLE_TARGET/etc/components"
    1.28 +                      ;;
    1.29 +                  esac
    1.30                  fi
    1.31                  ;;
    1.32              esac
    1.33 @@ -202,7 +210,7 @@
    1.34          cp -R "$APP_TEMPLATE/Resources/." "$APP/Contents/Resources/."
    1.35          cp "$APP_TEMPLATE/../isabelle.icns" "$APP/Contents/Resources/."
    1.36  
    1.37 -        ln -sf "../Resources/${ISABELLE_NAME}/contrib/jdk-7u21/x86_64-darwin/jdk1.7.0_21.jdk" \
    1.38 +        ln -sf "../Resources/${ISABELLE_NAME}/contrib/jdk/x86_64-darwin" \
    1.39            "$APP/Contents/PlugIns/jdk"
    1.40  
    1.41          cp macos_app/JavaAppLauncher "$APP/Contents/MacOS/." && \