# HG changeset patch # User kleing # Date 1405949037 -7200 # Node ID ce06a901c05009137f8022f07d8dbcdb84f0b912 # Parent 155b7e3b729e70b918df11d411b8e5cd49f1156d ghc mac installation repaired; test back on. diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/afp-poly --- a/Admin/isatest/settings/afp-poly Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/afp-poly Mon Jul 21 15:23:57 2014 +0200 @@ -5,7 +5,7 @@ # to be retired: # JINJATHREADS_OPTIONS="-M 1 -q 0 -p 0" -# ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/afp/isabelle-afp-poly diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly-M2 --- a/Admin/isatest/settings/mac-poly-M2 Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly-M2 Mon Jul 21 15:23:57 2014 +0200 @@ -9,7 +9,7 @@ ML_HOME="/home/polyml/polyml-5.5.0/$ML_PLATFORM" ML_OPTIONS="-H 500" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly-M2 diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly-M4 --- a/Admin/isatest/settings/mac-poly-M4 Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly-M4 Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 500 --gcthreads 4" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly-M4 diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly-M8 --- a/Admin/isatest/settings/mac-poly-M8 Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly-M8 Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 500 --gcthreads 8" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly-M8 diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly-M8-quick_and_dirty --- a/Admin/isatest/settings/mac-poly-M8-quick_and_dirty Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly-M8-quick_and_dirty Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 1000 --gcthreads 8" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly-M8-quick_and_dirty diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly-M8-skip_proofs --- a/Admin/isatest/settings/mac-poly-M8-skip_proofs Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly-M8-skip_proofs Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 1000 --gcthreads 8" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly-M8-skip_proofs diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly64-M2 --- a/Admin/isatest/settings/mac-poly64-M2 Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly64-M2 Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 1000" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-at-mac-poly64-M2 diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly64-M4 --- a/Admin/isatest/settings/mac-poly64-M4 Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly64-M4 Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 2000 --gcthreads 4" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly64-M4 diff -r 155b7e3b729e -r ce06a901c050 Admin/isatest/settings/mac-poly64-M8 --- a/Admin/isatest/settings/mac-poly64-M8 Sun Jul 20 22:05:35 2014 +0200 +++ b/Admin/isatest/settings/mac-poly64-M8 Mon Jul 21 15:23:57 2014 +0200 @@ -8,7 +8,7 @@ ML_HOME="$POLYML_HOME/$ML_PLATFORM" ML_OPTIONS="-H 2000 --gcthreads 8" -#ISABELLE_GHC=/opt/local/bin/ghc +ISABELLE_GHC=ghc ISABELLE_HOME_USER=~/isabelle-mac-poly64-M8