Merge pull request #45 from hannesm/no-xen

remove mirage-xen-posix cross-compilation rule (unneeded since mirage-xen 6.0.0)

.travis.yml

@@ -8,6 +8,9 @@ env:
   matrix:
   - 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.07" DEPOPTS="ocaml-freestanding"
+  - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.05"
+  - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.06"
+  - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.07"
+  - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.08"
+  - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.09" DEPOPTS="ocaml-freestanding"
+  - PACKAGE="bigstringaf" DISTRO="ubuntu-16.04" OCAML_VERSION="4.10" DEPOPTS="ocaml-freestanding"

META.bigstringaf.template

@@ -1,4 +1,3 @@
-# JBUILDER_GEN
+# DUNE_GEN
 
-xen_linkopts = "-l:xen/libbigstringaf_xen_stubs.a"
-freestanding_linkopts = "-l:freestanding/libbigstringaf_freestanding_stubs.a"
+freestanding_linkopts = "-l:libbigstringaf_freestanding_stubs.a"

bigstringaf.opam

@@ -11,17 +11,17 @@ build: [
   ["dune" "runtest" "-p" name] {with-test}
 ]
 depends: [
-  "dune" {build}
+  "dune" {>= "2.6.0"}
   "alcotest" {with-test}
   "bigarray-compat"
   "ocaml" {>= "4.03.0"}
+  "conf-pkg-config" {build}
 ]
 depopts: [
-  "mirage-xen-posix"
   "ocaml-freestanding"
 ]
 conflicts: [
-  "mirage-xen-posix" {< "3.1.0"}
+  "mirage-xen" {< "6.0.0"}
   "ocaml-freestanding" {< "0.4.1"}
   "js_of_ocaml" {< "3.5.0"}
 ]

dune-project

@@ -1,2 +1,2 @@
-(lang dune 1.0)
+(lang dune 2.6)
 (name bigstringaf)

lib/dune

@@ -4,8 +4,10 @@
  (libraries   bigarray-compat)
  (flags       (:standard -safe-string))
 
- (c_names     bigstringaf_stubs)
- (c_flags     (:standard -Wall -Wextra -Wpedantic))
+ (foreign_stubs
+  (language c)
+  (names     bigstringaf_stubs)
+  (flags     (:standard -Wall -Wextra -Wpedantic)))
 
  (js_of_ocaml (javascript_files runtime.js))
 )

lib/freestanding/Makefile

@@ -0,0 +1,23 @@
+PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
+
+EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
+
+.PHONY: all clean
+all: libbigstringaf_freestanding_stubs.a
+
+ifeq ($(EXISTS), 1)
+libbigstringaf_freestanding_stubs.a:
+	touch $@
+else
+CC ?= cc
+FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
+CFLAGS := -O3 $(FREESTANDING_CFLAGS)
+
+OBJS=bigstringaf_stubs.o
+
+libbigstringaf_freestanding_stubs.a: $(OBJS)
+	$(AR) r $@ $^
+endif
+
+clean:
+	$(RM) $(OBJS) libbigstringaf_freestanding_stubs.a

lib/freestanding/dune

@@ -1,11 +1,13 @@
-(library
- (name        bigstringaf_freestanding)
- (public_name bigstringaf.freestanding)
- (optional)
- (libraries   bigarray-compat ocaml-freestanding)
- (c_names     bigstringaf_stubs)
- (c_flags     (:include cflags.sexp)))
+(copy_files# ../bigstringaf_stubs.c)
 
-(rule (copy# ../bigstringaf_stubs.c bigstringaf_stubs.c))
+(rule
+ (deps Makefile bigstringaf_stubs.c)
+ (targets libbigstringaf_freestanding_stubs.a)
+ (action
+  (no-infer
+   (progn
+    (run %{make})))))
 
-(rule (with-stdout-to cflags.sexp (run ./cflags.sh)))
+(install
+ (section lib)
+ (files libbigstringaf_freestanding_stubs.a))

lib_test/dune

@@ -1,10 +1,4 @@
-(executables
+(test
+ (name test_bigstringaf)
  (libraries alcotest bigstringaf)
- (modules   test_bigstringaf s)
- (names     test_bigstringaf))
-
-(alias
- (name    runtest)
- (package bigstringaf)
- (deps    (:test test_bigstringaf.exe))
- (action  (run %{test})))
+ (modules   test_bigstringaf s))