more explicit opam dependencies;
authorwenzelm
Sat, 23 Mar 2019 15:17:32 +0100
changeset 69954 96905404ffba
parent 69953 3544cca7920f
child 69955 160fcaf502d7
more explicit opam dependencies;
Admin/components/components.sha1
Admin/components/main
Admin/ocaml/opam/README
Admin/ocaml/opam/x86_64-cygwin/opam
--- a/Admin/components/components.sha1	Fri Mar 22 22:37:30 2019 +0100
+++ b/Admin/components/components.sha1	Sat Mar 23 15:17:32 2019 +0100
@@ -169,6 +169,7 @@
 26df569cee9c2fd91b9ac06714afd43f3b37a1dd  nunchaku-0.3.tar.gz
 e573f2cbb57eb7b813ed5908753cfe2cb41033ca  nunchaku-0.5.tar.gz
 fe57793aca175336deea4f5e9c0d949a197850ac  opam-1.2.2.tar.gz
+eb499a18e7040ca0fe1ca824c9dcb2087c47c9ba  opam-2.0.3-1.tar.gz
 002f74c9e65e650de2638bf54d7b012b8de76c28  opam-2.0.3.tar.gz
 1c8cb6a8f4cbeaedce2d6d1ba8fc7e2ab3663aeb  polyml-5.4.1.tar.gz
 a3f9c159a0ee9a63b7a5d0c835ed9c2c908f8b56  polyml-5.5.0-1.tar.gz
--- a/Admin/components/main	Fri Mar 22 22:37:30 2019 +0100
+++ b/Admin/components/main	Sat Mar 23 15:17:32 2019 +0100
@@ -11,7 +11,7 @@
 jortho-1.0-2
 kodkodi-1.5.2-1
 nunchaku-0.5
-opam-2.0.3
+opam-2.0.3-1
 polyml-5.8
 postgresql-42.2.5
 scala-2.12.8
--- a/Admin/ocaml/opam/README	Fri Mar 22 22:37:30 2019 +0100
+++ b/Admin/ocaml/opam/README	Sat Mar 23 15:17:32 2019 +0100
@@ -3,8 +3,10 @@
 The executables for x86_64-linux and x86_64-darwin are from
 https://github.com/ocaml/opam/releases/tag/2.0.3
 
-The executable for x86_64-cygwin is provided as a Cygwin package.
+In order to work properly, the underlying OS platform needs to provide
+standard build tools for C/OCaml development. Cygwin requires a separate
+package "opam" version 2.0.x.
 
 
     Makarius
-    21-Mar-2018
+    23-Mar-2018
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/ocaml/opam/x86_64-cygwin/opam	Sat Mar 23 15:17:32 2019 +0100
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [ -e /usr/bin/opam ]; then
+  exec /usr/bin/opam "$@"
+else
+  echo >&2 "Missing opam executable: please install Cygwin package \"opam\" version 2.0.x"
+  exit 2
+fi