isabelle_opam as portable shell function;
authorwenzelm
Mon Oct 08 12:52:28 2018 +0200 (10 months ago)
changeset 69134a142ec271d83
parent 69133 22fe10b4c0c6
child 69135 be20f5f6feb9
isabelle_opam as portable shell function;
Admin/components/components.sha1
Admin/components/main
Admin/ocaml/opam/README
etc/settings
lib/scripts/getfunctions
     1.1 --- a/Admin/components/components.sha1	Sun Oct 07 16:28:38 2018 +0200
     1.2 +++ b/Admin/components/components.sha1	Mon Oct 08 12:52:28 2018 +0200
     1.3 @@ -146,6 +146,7 @@
     1.4  ad5d0e640ce3609a885cecab645389a2204e03bb  macos_app-20150916.tar.gz
     1.5  26df569cee9c2fd91b9ac06714afd43f3b37a1dd  nunchaku-0.3.tar.gz
     1.6  e573f2cbb57eb7b813ed5908753cfe2cb41033ca  nunchaku-0.5.tar.gz
     1.7 +fe57793aca175336deea4f5e9c0d949a197850ac  opam-1.2.2.tar.gz
     1.8  1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb  polyml-5.4.1.tar.gz
     1.9  a3f9c159a0ee9a63b7a5d0c835ed9c2c908f8b56  polyml-5.5.0-1.tar.gz
    1.10  7d604a99355efbfc1459d80db3279ffa7ade3e39  polyml-5.5.0-2.tar.gz
     2.1 --- a/Admin/components/main	Sun Oct 07 16:28:38 2018 +0200
     2.2 +++ b/Admin/components/main	Mon Oct 08 12:52:28 2018 +0200
     2.3 @@ -11,6 +11,7 @@
     2.4  jortho-1.0-2
     2.5  kodkodi-1.5.2-1
     2.6  nunchaku-0.5
     2.7 +opam-1.2.2
     2.8  polyml-5.7.1-8
     2.9  postgresql-42.2.5
    2.10  scala-2.12.7
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/Admin/ocaml/opam/README	Mon Oct 08 12:52:28 2018 +0200
     3.3 @@ -0,0 +1,10 @@
     3.4 +This is OPAM 1.2.2 -- the OCaml Package Manager.
     3.5 +
     3.6 +The executables for x86_64-linux and x86_64-darwin are from
     3.7 +https://github.com/ocaml/opam/releases/tag/1.2.2
     3.8 +
     3.9 +The executable for x86_64-cygwin is provided as a Cygwin package.
    3.10 +
    3.11 +
    3.12 +    Makarius
    3.13 +    08-Oct-2018
     4.1 --- a/etc/settings	Sun Oct 07 16:28:38 2018 +0200
     4.2 +++ b/etc/settings	Mon Oct 08 12:52:28 2018 +0200
     4.3 @@ -133,6 +133,13 @@
     4.4  
     4.5  
     4.6  ###
     4.7 +### OCaml
     4.8 +###
     4.9 +
    4.10 +ISABELLE_OPAM_ROOT="$ISABELLE_HOME_USER/opam"
    4.11 +
    4.12 +
    4.13 +###
    4.14  ### Misc settings
    4.15  ###
    4.16  
     5.1 --- a/lib/scripts/getfunctions	Sun Oct 07 16:28:38 2018 +0200
     5.2 +++ b/lib/scripts/getfunctions	Mon Oct 08 12:52:28 2018 +0200
     5.3 @@ -25,6 +25,18 @@
     5.4    export -f tar
     5.5  fi
     5.6  
     5.7 +#OCaml management via OPAM
     5.8 +function isabelle_opam()
     5.9 +{
    5.10 +  if [ -z "$ISABELLE_OPAM" ]; then
    5.11 +    echo "Unknown ISABELLE_OPAM -- OCaml management tools unavailable" >&2
    5.12 +    return 127
    5.13 +  else
    5.14 +    env OPAMROOT="$ISABELLE_OPAM_ROOT" "$ISABELLE_OPAM" "$@"
    5.15 +  fi
    5.16 +}
    5.17 +export -f isabelle_opam
    5.18 +
    5.19  #robust invocation via ISABELLE_JDK_HOME
    5.20  function isabelle_jdk ()
    5.21  {