1.1 --- a/Admin/makebundle	Sat Sep 17 16:29:18 2011 +0200
     1.2 +++ b/Admin/makebundle	Sat Sep 17 16:53:01 2011 +0200
     1.3 @@ -48,17 +48,19 @@
     1.4  
     1.5  echo "#bundled components" >> "$ISABELLE_HOME/etc/components"
     1.6  
     1.7 -for CONTRIB in "$ARCHIVE_DIR"/contrib/*.tar.gz
     1.8 +for CONTRIB in "$ARCHIVE_DIR/contrib/"*.tar.gz "$ARCHIVE_DIR/contrib/$PLATFORM"/*.tar.gz
     1.9  do
    1.10 -  tar -C "$ISABELLE_HOME/contrib" -x -z -f "$CONTRIB"
    1.11 -  NAME="$(basename "$CONTRIB" .tar.gz)"
    1.12 -  [ -d "$ISABELLE_HOME/contrib/$NAME" ] || fail "Bad archive content $CONTRIB"
    1.13 +  if [ -f "$CONTRIB" ]; then
    1.14 +    tar -C "$ISABELLE_HOME/contrib" -x -z -f "$CONTRIB"
    1.15 +    NAME="$(basename "$CONTRIB" .tar.gz)"
    1.16 +    [ -d "$ISABELLE_HOME/contrib/$NAME" ] || fail "Bad archive content $CONTRIB"
    1.17  
    1.18 -  if [ -e "$ISABELLE_HOME/contrib/$NAME/etc/settings" ]; then
    1.19 -    echo "component $NAME"
    1.20 -    echo "contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
    1.21 -  else
    1.22 -    echo "package $NAME"
    1.23 +    if [ -e "$ISABELLE_HOME/contrib/$NAME/etc/settings" ]; then
    1.24 +      echo "component $NAME"
    1.25 +      echo "contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
    1.26 +    else
    1.27 +      echo "package $NAME"
    1.28 +    fi
    1.29    fi
    1.30  done
    1.31  
    1.32 @@ -75,6 +77,10 @@
    1.33  )
    1.34  
    1.35  case "$PLATFORM" in
    1.36 +  x86_64-linux)
    1.37 +    perl -pi -e 's,^ML_PLATFORM=.*$,ML_PLATFORM="\$ISABELLE_PLATFORM64",g;' "$TMP/$ISABELLE_NAME/etc/settings"
    1.38 +    perl -pi -e "s,^ML_OPTIONS=.*$,ML_OPTIONS=\"-H 400\",g;" "$TMP/$ISABELLE_NAME/etc/settings"
    1.39 +    ;;
    1.40    *-darwin)
    1.41      perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.apple.laf.AquaLookAndFeel,g;" \
    1.42        "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props"

     2.1 --- a/etc/settings	Sat Sep 17 16:29:18 2011 +0200
     2.2 +++ b/etc/settings	Sat Sep 17 16:53:01 2011 +0200
     2.3 @@ -15,7 +15,7 @@
     2.4  # not invent new ML system names unless you know what you are doing.
     2.5  # Only one of the sections below should be activated.
     2.6  
     2.7 -# Poly/ML 32 bit (automated settings)
     2.8 +# Poly/ML default (automated settings)
     2.9  ML_PLATFORM="$ISABELLE_PLATFORM"
    2.10  ML_HOME="$(choosefrom \
    2.11    "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \