--- a/Admin/isatest/settings/cygwin-poly Mon Apr 19 11:30:08 2010 +0200
+++ b/Admin/isatest/settings/cygwin-poly Mon Apr 19 12:15:06 2010 +0200
@@ -22,6 +22,6 @@
ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
ISABELLE_BROWSER_INFO="$ISABELLE_HOME_USER/browser_info"
-ISABELLE_USEDIR_OPTIONS="-M 1 -i true -d pdf -v true -t true"
+ISABELLE_USEDIR_OPTIONS="-M 1 -i false -d false"
init_component "$HOME/contrib_devel/kodkodi"
--- a/NEWS Mon Apr 19 11:30:08 2010 +0200
+++ b/NEWS Mon Apr 19 12:15:06 2010 +0200
@@ -339,6 +339,13 @@
feature since Isabelle2009). Use ISABELLE_PROCESS and ISABELLE_TOOL,
respectively.
+* Old lib/scripts/polyml-platform is superseded by the
+ISABELLE_PLATFORM setting variable, which defaults to the 32 bit
+variant, even on a 64 bit machine. The following example setting
+prefers 64 bit if available:
+
+ ML_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM}"
+
New in Isabelle2009-1 (December 2009)
--- a/etc/settings Mon Apr 19 11:30:08 2010 +0200
+++ b/etc/settings Mon Apr 19 12:15:06 2010 +0200
@@ -17,7 +17,7 @@
# Poly/ML 5.x (automated settings)
POLY_HOME="$(type -p poly)"; [ -n "$POLY_HOME" ] && POLY_HOME="$(dirname "$POLY_HOME")"
-ML_PLATFORM=$("$ISABELLE_HOME/lib/scripts/polyml-platform")
+ML_PLATFORM="$ISABELLE_PLATFORM"
ML_HOME=$(choosefrom \
"$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
"$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
--- a/lib/scripts/polyml-platform Mon Apr 19 11:30:08 2010 +0200
+++ b/lib/scripts/polyml-platform Mon Apr 19 12:15:06 2010 +0200
@@ -1,69 +1,4 @@
#!/usr/bin/env bash
-#
-# polyml-platform --- determine Poly/ML's idea of current hardware and
-# operating system type
-#
-# NOTE: platform identifiers should be kept as generic as possible,
-# i.e. shared by compatible environments.
-
-PLATFORM="unknown-platform"
-case $(uname -s) in
- SunOS)
- case $(uname -r) in
- 5.*)
- case $(uname -p) in
- sparc)
- PLATFORM=sparc-solaris
- ;;
- i?86)
- PLATFORM=x86-solaris
- ;;
- esac
- ;;
- esac
- ;;
- Linux)
- case $(uname -m) in
- i?86 | x86_64)
- PLATFORM=x86-linux
- ;;
- Power* | power* | ppc)
- PLATFORM=ppc-linux
- ;;
- esac
- ;;
- FreeBSD|NetBSD)
- case $(uname -m) in
- i?86)
- PLATFORM=x86-bsd
- ;;
- esac
- ;;
- Darwin)
- case $(uname -m) in
- Power* | power* | ppc)
- PLATFORM=ppc-darwin
- ;;
- i?86)
- PLATFORM=x86-darwin
- ;;
- esac
- ;;
- CYGWIN_NT*)
- case $(uname -m) in
- i?86)
- PLATFORM=x86-cygwin
- ;;
- esac
- ;;
- Windows_NT)
- case $(uname -m) in
- ?86)
- PLATFORM=x86-win32
- ;;
- esac
- ;;
-esac
-
-echo "$PLATFORM"
+echo "### Legacy feature: polyml-platform script is superseded by ISABELLE_PLATFORM" >&2
+echo "$ISABELLE_PLATFORM"