--- a/Admin/components/components.sha1 Sun Oct 07 16:28:38 2018 +0200
+++ b/Admin/components/components.sha1 Mon Oct 08 12:52:28 2018 +0200
@@ -146,6 +146,7 @@
ad5d0e640ce3609a885cecab645389a2204e03bb macos_app-20150916.tar.gz
26df569cee9c2fd91b9ac06714afd43f3b37a1dd nunchaku-0.3.tar.gz
e573f2cbb57eb7b813ed5908753cfe2cb41033ca nunchaku-0.5.tar.gz
+fe57793aca175336deea4f5e9c0d949a197850ac opam-1.2.2.tar.gz
1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb polyml-5.4.1.tar.gz
a3f9c159a0ee9a63b7a5d0c835ed9c2c908f8b56 polyml-5.5.0-1.tar.gz
7d604a99355efbfc1459d80db3279ffa7ade3e39 polyml-5.5.0-2.tar.gz
--- a/Admin/components/main Sun Oct 07 16:28:38 2018 +0200
+++ b/Admin/components/main Mon Oct 08 12:52:28 2018 +0200
@@ -11,6 +11,7 @@
jortho-1.0-2
kodkodi-1.5.2-1
nunchaku-0.5
+opam-1.2.2
polyml-5.7.1-8
postgresql-42.2.5
scala-2.12.7
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/ocaml/opam/README Mon Oct 08 12:52:28 2018 +0200
@@ -0,0 +1,10 @@
+This is OPAM 1.2.2 -- the OCaml Package Manager.
+
+The executables for x86_64-linux and x86_64-darwin are from
+https://github.com/ocaml/opam/releases/tag/1.2.2
+
+The executable for x86_64-cygwin is provided as a Cygwin package.
+
+
+ Makarius
+ 08-Oct-2018
--- a/etc/settings Sun Oct 07 16:28:38 2018 +0200
+++ b/etc/settings Mon Oct 08 12:52:28 2018 +0200
@@ -133,6 +133,13 @@
###
+### OCaml
+###
+
+ISABELLE_OPAM_ROOT="$ISABELLE_HOME_USER/opam"
+
+
+###
### Misc settings
###
--- a/lib/scripts/getfunctions Sun Oct 07 16:28:38 2018 +0200
+++ b/lib/scripts/getfunctions Mon Oct 08 12:52:28 2018 +0200
@@ -25,6 +25,18 @@
export -f tar
fi
+#OCaml management via OPAM
+function isabelle_opam()
+{
+ if [ -z "$ISABELLE_OPAM" ]; then
+ echo "Unknown ISABELLE_OPAM -- OCaml management tools unavailable" >&2
+ return 127
+ else
+ env OPAMROOT="$ISABELLE_OPAM_ROOT" "$ISABELLE_OPAM" "$@"
+ fi
+}
+export -f isabelle_opam
+
#robust invocation via ISABELLE_JDK_HOME
function isabelle_jdk ()
{