merged
authorAndreas Lochbihler
Mon, 21 Jul 2014 17:57:16 +0200
changeset 58942b0ad484b7d1c
parent 58941 7ef939f89776
parent 58927 ce06a901c050
child 58943 22e810680123
merged
     1.1 --- a/Admin/isatest/settings/afp-poly	Mon Jul 21 17:51:29 2014 +0200
     1.2 +++ b/Admin/isatest/settings/afp-poly	Mon Jul 21 17:57:16 2014 +0200
     1.3 @@ -5,7 +5,7 @@
     1.4  # to be retired:
     1.5  # JINJATHREADS_OPTIONS="-M 1 -q 0 -p 0"
     1.6  
     1.7 -# ISABELLE_GHC=/opt/local/bin/ghc
     1.8 +ISABELLE_GHC=ghc
     1.9  
    1.10  ISABELLE_HOME_USER=~/afp/isabelle-afp-poly
    1.11  
     2.1 --- a/Admin/isatest/settings/mac-poly-M2	Mon Jul 21 17:51:29 2014 +0200
     2.2 +++ b/Admin/isatest/settings/mac-poly-M2	Mon Jul 21 17:57:16 2014 +0200
     2.3 @@ -9,7 +9,7 @@
     2.4  ML_HOME="/home/polyml/polyml-5.5.0/$ML_PLATFORM"
     2.5  ML_OPTIONS="-H 500"
     2.6  
     2.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     2.8 +ISABELLE_GHC=ghc
     2.9  
    2.10  ISABELLE_HOME_USER=~/isabelle-mac-poly-M2
    2.11  
     3.1 --- a/Admin/isatest/settings/mac-poly-M4	Mon Jul 21 17:51:29 2014 +0200
     3.2 +++ b/Admin/isatest/settings/mac-poly-M4	Mon Jul 21 17:57:16 2014 +0200
     3.3 @@ -8,7 +8,7 @@
     3.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     3.5    ML_OPTIONS="-H 500 --gcthreads 4"
     3.6  
     3.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     3.8 +ISABELLE_GHC=ghc
     3.9  
    3.10  ISABELLE_HOME_USER=~/isabelle-mac-poly-M4
    3.11  
     4.1 --- a/Admin/isatest/settings/mac-poly-M8	Mon Jul 21 17:51:29 2014 +0200
     4.2 +++ b/Admin/isatest/settings/mac-poly-M8	Mon Jul 21 17:57:16 2014 +0200
     4.3 @@ -8,7 +8,7 @@
     4.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     4.5    ML_OPTIONS="-H 500 --gcthreads 8"
     4.6  
     4.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     4.8 +ISABELLE_GHC=ghc
     4.9  
    4.10  ISABELLE_HOME_USER=~/isabelle-mac-poly-M8
    4.11  
     5.1 --- a/Admin/isatest/settings/mac-poly-M8-quick_and_dirty	Mon Jul 21 17:51:29 2014 +0200
     5.2 +++ b/Admin/isatest/settings/mac-poly-M8-quick_and_dirty	Mon Jul 21 17:57:16 2014 +0200
     5.3 @@ -8,7 +8,7 @@
     5.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     5.5    ML_OPTIONS="-H 1000 --gcthreads 8"
     5.6  
     5.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     5.8 +ISABELLE_GHC=ghc
     5.9  
    5.10  ISABELLE_HOME_USER=~/isabelle-mac-poly-M8-quick_and_dirty
    5.11  
     6.1 --- a/Admin/isatest/settings/mac-poly-M8-skip_proofs	Mon Jul 21 17:51:29 2014 +0200
     6.2 +++ b/Admin/isatest/settings/mac-poly-M8-skip_proofs	Mon Jul 21 17:57:16 2014 +0200
     6.3 @@ -8,7 +8,7 @@
     6.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     6.5    ML_OPTIONS="-H 1000 --gcthreads 8"
     6.6  
     6.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     6.8 +ISABELLE_GHC=ghc
     6.9  
    6.10  ISABELLE_HOME_USER=~/isabelle-mac-poly-M8-skip_proofs
    6.11  
     7.1 --- a/Admin/isatest/settings/mac-poly64-M2	Mon Jul 21 17:51:29 2014 +0200
     7.2 +++ b/Admin/isatest/settings/mac-poly64-M2	Mon Jul 21 17:57:16 2014 +0200
     7.3 @@ -8,7 +8,7 @@
     7.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     7.5    ML_OPTIONS="-H 1000"
     7.6  
     7.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     7.8 +ISABELLE_GHC=ghc
     7.9  
    7.10  ISABELLE_HOME_USER=~/isabelle-at-mac-poly64-M2
    7.11  
     8.1 --- a/Admin/isatest/settings/mac-poly64-M4	Mon Jul 21 17:51:29 2014 +0200
     8.2 +++ b/Admin/isatest/settings/mac-poly64-M4	Mon Jul 21 17:57:16 2014 +0200
     8.3 @@ -8,7 +8,7 @@
     8.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     8.5    ML_OPTIONS="-H 2000 --gcthreads 4"
     8.6  
     8.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     8.8 +ISABELLE_GHC=ghc
     8.9  
    8.10  ISABELLE_HOME_USER=~/isabelle-mac-poly64-M4
    8.11  
     9.1 --- a/Admin/isatest/settings/mac-poly64-M8	Mon Jul 21 17:51:29 2014 +0200
     9.2 +++ b/Admin/isatest/settings/mac-poly64-M8	Mon Jul 21 17:57:16 2014 +0200
     9.3 @@ -8,7 +8,7 @@
     9.4    ML_HOME="$POLYML_HOME/$ML_PLATFORM"
     9.5    ML_OPTIONS="-H 2000 --gcthreads 8"
     9.6  
     9.7 -#ISABELLE_GHC=/opt/local/bin/ghc
     9.8 +ISABELLE_GHC=ghc
     9.9  
    9.10  ISABELLE_HOME_USER=~/isabelle-mac-poly64-M8
    9.11