1.1 --- a/NEWS	Mon Apr 19 10:19:37 2010 +0200
     1.2 +++ b/NEWS	Mon Apr 19 10:56:26 2010 +0200
     1.3 @@ -339,6 +339,13 @@
     1.4  feature since Isabelle2009).  Use ISABELLE_PROCESS and ISABELLE_TOOL,
     1.5  respectively.
     1.6  
     1.7 +* Old lib/scripts/polyml-platform is superseded by the
     1.8 +ISABELLE_PLATFORM setting variable, which defaults to the 32 bit
     1.9 +variant, even on a 64 bit machine.  The following example setting
    1.10 +prefers 64 bit if available:
    1.11 +
    1.12 +  ML_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM}"
    1.13 +
    1.14  
    1.15  
    1.16  New in Isabelle2009-1 (December 2009)

     2.1 --- a/etc/settings	Mon Apr 19 10:19:37 2010 +0200
     2.2 +++ b/etc/settings	Mon Apr 19 10:56:26 2010 +0200
     2.3 @@ -17,7 +17,7 @@
     2.4  
     2.5  # Poly/ML 5.x (automated settings)
     2.6  POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
     2.7 -ML_PLATFORM=$("$ISABELLE_HOME/lib/scripts/polyml-platform")
     2.8 +ML_PLATFORM="$ISABELLE_PLATFORM"
     2.9  ML_HOME=$(choosefrom \
    2.10    "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
    2.11    "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \

     3.1 --- a/lib/scripts/polyml-platform	Mon Apr 19 10:19:37 2010 +0200
     3.2 +++ b/lib/scripts/polyml-platform	Mon Apr 19 10:56:26 2010 +0200
     3.3 @@ -1,69 +1,4 @@
     3.4  #!/usr/bin/env bash
     3.5 -#
     3.6 -# polyml-platform --- determine Poly/ML's idea of current hardware and
     3.7 -# operating system type
     3.8 -#
     3.9 -# NOTE: platform identifiers should be kept as generic as possible,
    3.10 -# i.e. shared by compatible environments.
    3.11  
    3.12 -PLATFORM="unknown-platform"
    3.13 -
    3.14 -case $(uname -s) in
    3.15 -  SunOS)
    3.16 -    case $(uname -r) in
    3.17 -      5.*)
    3.18 -        case $(uname -p) in
    3.19 -          sparc)
    3.20 -            PLATFORM=sparc-solaris
    3.21 -            ;;
    3.22 -          i?86)
    3.23 -            PLATFORM=x86-solaris
    3.24 -            ;;
    3.25 -        esac
    3.26 -        ;;
    3.27 -    esac
    3.28 -    ;;
    3.29 -  Linux)
    3.30 -    case $(uname -m) in
    3.31 -      i?86 | x86_64)
    3.32 -        PLATFORM=x86-linux
    3.33 -        ;;
    3.34 -      Power* | power* | ppc)
    3.35 -        PLATFORM=ppc-linux
    3.36 -        ;;
    3.37 -    esac
    3.38 -    ;;
    3.39 -  FreeBSD|NetBSD)
    3.40 -    case $(uname -m) in
    3.41 -      i?86)
    3.42 -        PLATFORM=x86-bsd
    3.43 -        ;;
    3.44 -    esac
    3.45 -    ;;
    3.46 -  Darwin)
    3.47 -    case $(uname -m) in
    3.48 -      Power* | power* | ppc)
    3.49 -        PLATFORM=ppc-darwin
    3.50 -        ;;
    3.51 -      i?86)
    3.52 -        PLATFORM=x86-darwin
    3.53 -        ;;
    3.54 -    esac
    3.55 -    ;;
    3.56 -  CYGWIN_NT*)
    3.57 -    case $(uname -m) in
    3.58 -      i?86)
    3.59 -        PLATFORM=x86-cygwin
    3.60 -        ;;
    3.61 -    esac
    3.62 -    ;;
    3.63 -  Windows_NT)
    3.64 -    case $(uname -m) in
    3.65 -      ?86)
    3.66 -        PLATFORM=x86-win32
    3.67 -        ;;
    3.68 -    esac
    3.69 -    ;;
    3.70 -esac
    3.71 -
    3.72 -echo "$PLATFORM"
    3.73 +echo "### Legacy feature: polyml-platform script is superseded by ISABELLE_PLATFORM" >&2
    3.74 +echo "$ISABELLE_PLATFORM"