clarified settings for default Poly/ML version: test the actual Isabelle component;
--- a/Admin/isatest/settings/afp-poly Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/afp-poly Fri Apr 24 14:56:47 2015 +0200
@@ -2,11 +2,9 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.2"
- ML_SYSTEM="polyml-5.5.2"
- ML_PLATFORM="x86_64-darwin"
- ML_HOME="$POLYML_HOME/$ML_PLATFORM"
- ML_OPTIONS="-H 2000"
+ML_PLATFORM="$ISABELLE_PLATFORM64"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="-H 2000"
ISABELLE_GHC=ghc
--- a/Admin/isatest/settings/at64-poly Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/at64-poly Fri Apr 24 14:56:47 2015 +0200
@@ -2,11 +2,9 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.2"
- ML_SYSTEM="polyml-5.5.2"
- ML_PLATFORM="x86_64-linux"
- ML_HOME="$POLYML_HOME/$ML_PLATFORM"
- ML_OPTIONS="--minheap 2000 --maxheap 8000 --gcthreads 1"
+ML_PLATFORM="$ISABELLE_PLATFORM64"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="--minheap 2000 --maxheap 8000 --gcthreads 1"
ISABELLE_HOME_USER=~/isabelle-at64-poly
--- a/Admin/isatest/settings/mac-poly-M2-alternative Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/mac-poly-M2-alternative Fri Apr 24 14:56:47 2015 +0200
@@ -4,9 +4,8 @@
init_components /home/isabelle/contrib "$HOME/admin/components/optional"
init_components /home/isabelle/contrib "$HOME/admin/components/nonfree"
-ML_SYSTEM="polyml-5.5.2"
-ML_PLATFORM="x86-darwin"
-ML_HOME="/home/polyml/polyml-5.5.2/$ML_PLATFORM"
+ML_PLATFORM="$ISABELLE_PLATFORM32"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
ML_OPTIONS="-H 1000"
ISABELLE_HOME_USER=~/isabelle-mac-poly-M2-alternative
--- a/Admin/isatest/settings/mac-poly-M4 Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/mac-poly-M4 Fri Apr 24 14:56:47 2015 +0200
@@ -2,11 +2,9 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.2"
- ML_SYSTEM="polyml-5.5.2"
- ML_PLATFORM="x86-darwin"
- ML_HOME="$POLYML_HOME/$ML_PLATFORM"
- ML_OPTIONS="-H 500 --gcthreads 4"
+ML_PLATFORM="$ISABELLE_PLATFORM32"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="-H 500 --gcthreads 4"
ISABELLE_HOME_USER=~/isabelle-mac-poly-M4
--- a/Admin/isatest/settings/mac-poly-M8 Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/mac-poly-M8 Fri Apr 24 14:56:47 2015 +0200
@@ -2,11 +2,9 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.2"
- ML_SYSTEM="polyml-5.5.2"
- ML_PLATFORM="x86-darwin"
- ML_HOME="$POLYML_HOME/$ML_PLATFORM"
- ML_OPTIONS="-H 500 --gcthreads 8"
+ML_PLATFORM="$ISABELLE_PLATFORM32"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="-H 500 --gcthreads 8"
ISABELLE_HOME_USER=~/isabelle-mac-poly-M8
--- a/Admin/isatest/settings/mac-poly64-M4 Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/mac-poly64-M4 Fri Apr 24 14:56:47 2015 +0200
@@ -2,11 +2,9 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.2"
- ML_SYSTEM="polyml-5.5.2"
- ML_PLATFORM="x86_64-darwin"
- ML_HOME="$POLYML_HOME/$ML_PLATFORM"
- ML_OPTIONS="-H 2000 --gcthreads 4"
+ML_PLATFORM="$ISABELLE_PLATFORM64"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="-H 2000 --gcthreads 4"
ISABELLE_GHC=ghc
--- a/Admin/isatest/settings/mac-poly64-M8 Wed Apr 22 23:26:14 2015 +0200
+++ b/Admin/isatest/settings/mac-poly64-M8 Fri Apr 24 14:56:47 2015 +0200
@@ -2,11 +2,9 @@
init_components /home/isabelle/contrib "$HOME/admin/components/main"
- POLYML_HOME="/home/polyml/polyml-5.5.2"
- ML_SYSTEM="polyml-5.5.2"
- ML_PLATFORM="x86_64-darwin"
- ML_HOME="$POLYML_HOME/$ML_PLATFORM"
- ML_OPTIONS="-H 2000 --gcthreads 8"
+ML_PLATFORM="$ISABELLE_PLATFORM64"
+ML_HOME="$POLYML_HOME/$ML_PLATFORM"
+ML_OPTIONS="-H 2000 --gcthreads 8"
ISABELLE_GHC=ghc