# HG changeset patch
# User hoelzl
# Date 1300112950 -3600
# Node ID 96cbc6379e5a5d08699b2a7d3a78ad7e0c6a23e6
# Parent  7f5c9bd991be283e729ec851aab936ba8b1bdde1# Parent  cdf7693bbe08f54fb586203402d63ebb0a146b94
merged

diff -r cdf7693bbe08 -r 96cbc6379e5a Admin/isatest/isatest-makeall
--- a/Admin/isatest/isatest-makeall	Mon Mar 14 14:37:49 2011 +0100
+++ b/Admin/isatest/isatest-makeall	Mon Mar 14 15:29:10 2011 +0100
@@ -153,6 +153,7 @@
         rm -rf $ISABELLE_HOME_USER
     fi
 
+    cp $DISTPREFIX/Isabelle/etc/settings.orig $DISTPREFIX/Isabelle/etc/settings
     cat $SETTINGS >> $DISTPREFIX/Isabelle/etc/settings
     (ulimit -t $MAXTIME; cd $DIR; $NICE $TOOL >> $TESTLOG 2>&1)
 
diff -r cdf7693bbe08 -r 96cbc6379e5a Admin/isatest/isatest-makedist
--- a/Admin/isatest/isatest-makedist	Mon Mar 14 14:37:49 2011 +0100
+++ b/Admin/isatest/isatest-makedist	Mon Mar 14 15:29:10 2011 +0100
@@ -83,6 +83,7 @@
 ISABELLE_DIST=`cat $DISTPREFIX/ISABELLE_DIST`
 $TAR xvzf $ISABELLE_DIST >> $DISTLOG 2>&1
 ln -sf $(basename $ISABELLE_DIST .tar.gz) Isabelle
+cp Isabelle/etc/settings Isabelle/etc/settings.orig
 
 ssh atbroy102 "rm -rf /home/isatest/isadist && mkdir -p /home/isatest/isadist" && \
 rsync -a "$HOME/isadist/." atbroy102:/home/isatest/isadist/.
diff -r cdf7693bbe08 -r 96cbc6379e5a Admin/isatest/settings/at-mac-poly-5.1-para
--- a/Admin/isatest/settings/at-mac-poly-5.1-para	Mon Mar 14 14:37:49 2011 +0100
+++ b/Admin/isatest/settings/at-mac-poly-5.1-para	Mon Mar 14 15:29:10 2011 +0100
@@ -25,4 +25,3 @@
 
 ISABELLE_USEDIR_OPTIONS="-i false -d false -t true -M 4 -q 2"
 
-unset KODKODI
diff -r cdf7693bbe08 -r 96cbc6379e5a Admin/isatest/settings/at-sml-dev-e
--- a/Admin/isatest/settings/at-sml-dev-e	Mon Mar 14 14:37:49 2011 +0100
+++ b/Admin/isatest/settings/at-sml-dev-e	Mon Mar 14 15:29:10 2011 +0100
@@ -24,5 +24,3 @@
 
 ISABELLE_USEDIR_OPTIONS="-i true -d pdf -v true"
 
-unset KODKODI
-
diff -r cdf7693bbe08 -r 96cbc6379e5a etc/settings
--- a/etc/settings	Mon Mar 14 14:37:49 2011 +0100
+++ b/etc/settings	Mon Mar 14 15:29:10 2011 +0100
@@ -228,3 +228,8 @@
 # Second option: use the open source glpk solver
 #LP_SOLVER=GLPK
 #GLPK_PATH=glpsol
+
+# Misc programming languages
+#ISABELLE_GHC="/usr/local/ghc/$ISABELLE_PLATFORM/ghc"
+#ISABELLE_OCAML="/usr/local/ocaml/$ISABELLE_PLATFORM/ocaml"
+#ISABELLE_SWIPL="/usr/local/swipl/$ISABELLE_PLATFORM/swipl"