Move to dune.2.6.0

mirage · Jun 15, 2020 · aa9352d · aa9352d
1 parent 8f69623
commit aa9352d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/dune-project b/dune-project
@@ -1,3 +1,2 @@
-(lang dune 1.7)
-(using library_variants 0.1)
+(lang dune 2.6)
 (name digestif)
diff --git a/src-c/native/dune b/src-c/native/dune
@@ -1,5 +1,7 @@
 (library
  (name        rakia)
  (public_name digestif.rakia)
- (c_names     blake2b blake2s md5 ripemd160 sha1 sha256 sha512 whirlpool misc stubs)
- (c_flags     (:standard -I.)))
+ (foreign_stubs
+  (language c)
+  (names blake2b blake2s md5 ripemd160 sha1 sha256 sha512 whirlpool misc stubs)
+  (flags (:standard -I.))))
diff --git a/src-c/native/freestanding/dune b/src-c/native/freestanding/dune
@@ -3,8 +3,10 @@
  (public_name digestif.rakia.freestanding)
  (optional)
  (libraries   bigarray-compat ocaml-freestanding)
- (c_names     blake2b blake2s md5 ripemd160 sha1 sha256 sha512 whirlpool misc stubs)
- (c_flags     (:include cflags.sexp)))
+ (foreign_stubs
+  (language c)
+  (names blake2b blake2s md5 ripemd160 sha1 sha256 sha512 whirlpool misc stubs)
+  (flags (:include cflags.sexp))))
 
 (rule (copy# ../blake2b.c blake2b.c))
 (rule (copy# ../blake2s.c blake2s.c))

diff --git a/src-c/native/xen/dune b/src-c/native/xen/dune
@@ -3,8 +3,10 @@
  (public_name digestif.rakia.xen)
  (optional)
  (libraries   bigarray-compat mirage-xen-posix)
- (c_names     blake2b blake2s md5 ripemd160 sha1 sha256 sha512 whirlpool misc stubs)
- (c_flags     (:include cflags.sexp)))
+ (foreign_stubs
+  (language c)
+  (names blake2b blake2s md5 ripemd160 sha1 sha256 sha512 whirlpool misc stubs)
+  (flags (:include cflags.sexp))))
 
 (rule (copy# ../blake2b.c blake2b.c))
 (rule (copy# ../blake2s.c blake2s.c))

diff --git a/test/c/dune b/test/c/dune
@@ -3,8 +3,8 @@
  (modules test)
  (libraries fmt alcotest digestif.c))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (deps (:test test.exe) ../blake2b.test ../blake2s.test)
  (action (run %{test} --color=always)))
 

diff --git a/test/conv/dune b/test/conv/dune
@@ -3,6 +3,6 @@
  (modules   test_conv)
  (libraries digestif.c fmt alcotest))
 
-(alias
- (name   runtest)
+(rule
+ (alias   runtest)
  (action (run ./test_conv.exe --color=always)))
diff --git a/test/ocaml/dune b/test/ocaml/dune
@@ -3,8 +3,8 @@
  (modules test)
  (libraries fmt alcotest digestif.ocaml))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (deps (:test test.exe) ../blake2b.test ../blake2s.test)
  (action (run %{test} --color=always)))