# HG changeset patch
# User wenzelm
# Date 1347527580 -7200
# Node ID f182f7fa158f3ac365adf5527ffc1b3d66463d1c
# Parent  ce1ccb78ecdabc6af3d032cf60e9edf2eaf7de55
more standard init_components -- particularly important to pick up correct jdk/scala version;

diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/afp-poly
--- a/Admin/isatest/settings/afp-poly	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/afp-poly	Thu Sep 13 11:13:00 2012 +0200
@@ -1,8 +1,8 @@
 # -*- shell-script -*- :mode=shellscript:
 
-CONTRIB=~/afp/contrib
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
 
-  POLYML_HOME=$CONTRIB/polyml-5.4.1
+  POLYML_HOME="$HOME/afp/contrib/polyml-5.4.1"
   ML_SYSTEM="polyml-5.4.1"
   ML_PLATFORM="x86_64-darwin"
   ML_HOME="$POLYML_HOME/$ML_PLATFORM"
@@ -29,4 +29,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=false document=false threads=4 parallel_proofs=2"
 
-init_component "$CONTRIB/kodkodi-1.2.16"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/at-poly
--- a/Admin/isatest/settings/at-poly	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/at-poly	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-5.3.0"
   ML_SYSTEM="polyml-5.3.0"
   ML_PLATFORM="x86-linux"
@@ -24,5 +26,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=true document=pdf"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
-
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/at-poly-e
--- a/Admin/isatest/settings/at-poly-e	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/at-poly-e	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-5.3.0"
   ML_SYSTEM="polyml-5.3.0"
   ML_PLATFORM="x86-linux"
@@ -24,4 +26,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=true document=pdf"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/at-poly-test
--- a/Admin/isatest/settings/at-poly-test	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/at-poly-test	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-svn"
   ML_SYSTEM="polyml-5.5.0"
   ML_PLATFORM="x86-linux"
@@ -28,4 +30,3 @@
 ISABELLE_OCAML="/usr/bin/ocaml"
 ISABELLE_SWIPL="/home/isabelle/contrib_devel/swipl/bin/swipl"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/at-sml-dev-e
--- a/Admin/isatest/settings/at-sml-dev-e	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/at-sml-dev-e	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
 ML_SYSTEM=smlnj
 ML_HOME="/home/smlnj/110.74/bin"
 ML_OPTIONS="@SMLdebug=/dev/null @SMLalloc=1024"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/at64-poly
--- a/Admin/isatest/settings/at64-poly	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/at64-poly	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-5.4.1"
   ML_SYSTEM="polyml-5.4.1"
   ML_PLATFORM="x86_64-linux"
@@ -24,4 +26,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=true document=pdf"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/mac-poly-M4
--- a/Admin/isatest/settings/mac-poly-M4	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/mac-poly-M4	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-svn"
   ML_SYSTEM="polyml-5.5.0"
   ML_PLATFORM="x86-darwin"
@@ -25,4 +27,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=false document=false threads=4 parallel_proofs=2"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/mac-poly-M8
--- a/Admin/isatest/settings/mac-poly-M8	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/mac-poly-M8	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-svn"
   ML_SYSTEM="polyml-5.5.0"
   ML_PLATFORM="x86-darwin"
@@ -25,5 +27,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=false document=false threads=8 parallel_proofs=2"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
-
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/mac-poly64-M2
--- a/Admin/isatest/settings/mac-poly64-M2	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/mac-poly64-M2	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-5.4.0"
   ML_SYSTEM="polyml-5.4.0"
   ML_PLATFORM="x86_64-darwin"
@@ -25,5 +27,3 @@
 
 ISABELLE_BUILD_OPTIONS="browser_info=false document=false threads=2 parallel_proofs=2"
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
-
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/mac-poly64-M4
--- a/Admin/isatest/settings/mac-poly64-M4	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/mac-poly64-M4	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-5.4.1"
   ML_SYSTEM="polyml-5.4.1"
   ML_PLATFORM="x86_64-darwin"
@@ -27,4 +29,3 @@
 
 ISABELLE_FULL_TEST=true
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
diff -r ce1ccb78ecda -r f182f7fa158f Admin/isatest/settings/mac-poly64-M8
--- a/Admin/isatest/settings/mac-poly64-M8	Thu Sep 13 10:28:48 2012 +0200
+++ b/Admin/isatest/settings/mac-poly64-M8	Thu Sep 13 11:13:00 2012 +0200
@@ -1,5 +1,7 @@
 # -*- shell-script -*- :mode=shellscript:
 
+init_components /home/isabelle/contrib "$HOME/admin/components/main"
+
   POLYML_HOME="/home/polyml/polyml-5.4.1"
   ML_SYSTEM="polyml-5.4.1"
   ML_PLATFORM="x86_64-darwin"
@@ -27,5 +29,3 @@
 
 ISABELLE_FULL_TEST=true
 
-init_component "$HOME/contrib_devel/kodkodi-1.2.16"
-