From bba7046ff5e18eabf0a89c891b263a038251c2c7 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 23 Oct 2018 10:52:27 -0400 Subject: [PATCH 1/6] Fix the generation of flags for freestanding The shell script is local and hence should be prefixed Signed-off-by: Rudi Grinberg --- lib/freestanding/jbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/freestanding/jbuild b/lib/freestanding/jbuild index a9efd2f..38c9a31 100644 --- a/lib/freestanding/jbuild +++ b/lib/freestanding/jbuild @@ -10,4 +10,4 @@ (rule (copy# ../bigstringaf_stubs.c bigstringaf_stubs.c)) -(rule (with-stdout-to cflags.sexp (run cflags.sh))) +(rule (with-stdout-to cflags.sexp (run ./cflags.sh))) From 54f12c86c596d39820c9080752129dd75f4c8801 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 25 Oct 2018 14:24:14 +0200 Subject: [PATCH 2/6] use ./cflags.sh here as well --- lib/xen/jbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xen/jbuild b/lib/xen/jbuild index 32cf85a..ebdb4b5 100644 --- a/lib/xen/jbuild +++ b/lib/xen/jbuild @@ -10,4 +10,4 @@ (rule (copy# ../bigstringaf_stubs.c bigstringaf_stubs.c)) -(rule (with-stdout-to cflags.sexp (run cflags.sh))) +(rule (with-stdout-to cflags.sexp (run ./cflags.sh))) From 2641dd4f2c6625371e4a4dc2a7977ddb7d70dcb5 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 25 Oct 2018 14:24:45 +0200 Subject: [PATCH 3/6] use ocaml-freestanding everywhere (since 0.4.1 it also installs a META file) --- bigstringaf.opam | 3 +++ lib/freestanding/jbuild | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bigstringaf.opam b/bigstringaf.opam index 36ef484..9d67823 100644 --- a/bigstringaf.opam +++ b/bigstringaf.opam @@ -20,6 +20,9 @@ depopts: [ "mirage-xen-posix" "ocaml-freestanding" ] +conflicts: [ + "ocaml-freestanding" {< "0.4.1"} +] synopsis: "Bigstring intrinsics and fast blits based on memcpy/memmove" description: """ Bigstring intrinsics and fast blits based on memcpy/memmove diff --git a/lib/freestanding/jbuild b/lib/freestanding/jbuild index 38c9a31..05cf397 100644 --- a/lib/freestanding/jbuild +++ b/lib/freestanding/jbuild @@ -4,7 +4,7 @@ ((name bigstringaf_freestanding) (public_name bigstringaf.freestanding) (optional) - (libraries (bigarray mirage-solo5)) + (libraries (bigarray ocaml-freestanding)) (c_names (bigstringaf_stubs)) (c_flags (:include cflags.sexp)))) From 3a66686b6632624a361974e15011fc307acafdc6 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 25 Oct 2018 14:34:57 +0200 Subject: [PATCH 4/6] travis: test optional dependencies --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe44134..6fdb5b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,6 @@ env: matrix: - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.03.0" - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2" - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.05.0" - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06.0" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.05.0" DEPOPTS="mirage-xen-posix" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06.0" DEPOPTS="ocaml-freestanding" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06.0" DEPOPTS="ocaml-freestanding" From 57ac26c2d470f8c98dab7836873c00d6a8b4e4f9 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 26 Oct 2018 00:16:13 +0200 Subject: [PATCH 5/6] update changes entries --- CHANGES.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 043ea0d..89fe10e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,9 @@ -### 0.4.0 (2018-10-23) +### 0.4.0 (2018-10-26) -* unify usage of mirage-xen-posix package (#17 @hannesm) +* freestanding: fix dependencies (ocaml-freestanding #22 @hannesm) +* xen: unify usage of mirage-xen-posix package (#17 @hannesm) * fix typo in comment (#18 @tiensonqin) -* jbuild: do not use bash (#16 @rgrinberg) +* jbuild: do not use bash (#16 #21 @rgrinberg, #22 @hannesm) * opam: add '"-p" name' to subst command (#15 @seliopou) ### 0.3.0 (2018-07-07) From 1d02c7575d218d218dc3e35269f73fd0ee1b3768 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 26 Oct 2018 02:32:59 +0200 Subject: [PATCH 6/6] travis: adjust to recent changes, use major.minor, test 4.07 --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fdb5b5..348297e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,9 @@ install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/ma script: bash -ex ./.travis-docker.sh env: matrix: - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.03.0" - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.2" - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.05.0" DEPOPTS="mirage-xen-posix" - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06.0" DEPOPTS="ocaml-freestanding" - - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06.0" DEPOPTS="ocaml-freestanding" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.03" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.04" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.05" DEPOPTS="mirage-xen-posix" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06" DEPOPTS="ocaml-freestanding" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06" DEPOPTS="ocaml-freestanding" + - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.07" DEPOPTS="ocaml-freestanding"