metadata fixes and support dune-release

mirage · Jan 22, 2019 · 923d046 · 923d046
1 parent 3d1a7ee
commit 923d046
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,6 @@ env:
   - PACKAGE="cstruct"       DISTRO="alpine"   OCAML_VERSION="4.06"
   - PACKAGE="cstruct"       DISTRO="alpine"   OCAML_VERSION="4.07"
   - PACKAGE="cstruct-lwt"   DISTRO="debian-testing"  OCAML_VERSION="4.07"
-  - PACKAGE="cstruct-async" DISTRO="debian-unstable" OCAML_VERSION="4.07"
+  - PACKAGE="cstruct-async" DISTRO="centos"   OCAML_VERSION="4.07"
   - PACKAGE="ppx_cstruct"   DISTRO="debian-unstable" OCAML_VERSION="4.07"
   - PACKAGE="cstruct-unix"  DISTRO="ubuntu"          OCAML_VERSION="4.07"
-  - PACKAGE="cstruct-unix"  DISTRO="fedora"          OCAML_VERSION="4.07"
diff --git a/CHANGES.md b/CHANGES.md
@@ -15,7 +15,9 @@ v3.3.0 2019-01-22
   primarily there for older compilers, and new uses should be
   based around `ppxlib`. (#201 by @edwintorok).
 
-- Upgrade opam metadata to 2.0 format. (#217 by @XVilka)
+- Upgrade opam metadata to 2.0 format. (#217 by @XVilka @avsm)
+
+- Support dune-release instead of topkg (@avsm)
 
 v3.2.1 2017-12-13
 -----------------

diff --git a/Makefile b/Makefile
@@ -1,31 +1,18 @@
 .PHONY: all clean fuzz build-fuzz
 
 all:
-	jbuilder build @install --dev
+	dune build
 
 clean:
-	jbuilder clean
+	dune clean
 
 test:
-	jbuilder runtest --dev
+	dune runtest
 
 build-fuzz:
-	jbuilder build --dev fuzz/fuzz.exe
+	dune build fuzz/fuzz.exe
 
 fuzz: build-fuzz
 	mkdir -p _build/in
 	echo > _build/in/empty
 	afl-fuzz -i _build/in -o _build/out -- _build/default/fuzz/fuzz.exe @@
-
-REPO=../../mirage/opam-repository
-PACKAGES=$(REPO)/packages
-# until we have https://github.com/ocaml/opam-publish/issues/38
-pkg-%:
-	topkg opam pkg -n $*
-	mkdir -p $(PACKAGES)/$*
-	cp -r _build/$*.* $(PACKAGES)/$*/
-	cd $(PACKAGES) && git add $*
-
-PKGS=$(basename $(wildcard *.opam))
-opam-pkg:
-	$(MAKE) $(PKGS:%=pkg-%)
diff --git a/cstruct-async.opam b/cstruct-async.opam
@@ -8,6 +8,7 @@ license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
 bug-reports:  "https://github.com/mirage/ocaml-cstruct/issues"
 tags: [ "org:mirage" "org:ocamllabs" ]
+doc: "https://mirage.githbu.io/ocaml-cstruct/"
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
@@ -18,13 +19,10 @@ depends: [
   "async_kernel" {>= "v0.9.0" & < "v0.12"}
   "async_unix" {>= "v0.9.0" & < "v0.12"}
   "core_kernel" {>= "v0.9.0" & < "v0.12"}
-  "cstruct" {>= "3.0.0"}
+  "cstruct" {>= "3.2.0"}
 ]
 synopsis: "Access C-like structures directly from OCaml"
 description: """
 Cstruct is a library and syntax extension to make it easier to access C-like
 structures directly from OCaml.  It supports both reading and writing to these
 structures, and they are accessed via the `Bigarray` module."""
-url {
-  src: "git+https://github.com/mirage/ocaml-cstruct.git"
-}
diff --git a/cstruct-lwt.opam b/cstruct-lwt.opam
@@ -7,6 +7,7 @@ homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
 bug-reports:  "https://github.com/mirage/ocaml-cstruct/issues"
+doc: "https://mirage.githbu.io/ocaml-cstruct/"
 tags: [ "org:mirage" "org:ocamllabs" ]
 build: [
   ["dune" "subst"] {pinned}
@@ -16,7 +17,7 @@ depends: [
   "ocaml" {>= "4.03.0"}
   "base-unix"
   "lwt"
-  "cstruct"
+  "cstruct" {>="3.2.0"}
   "dune" {build & >= "1.0"}
 ]
 synopsis: "Access C-like structures directly from OCaml"

diff --git a/cstruct-unix.opam b/cstruct-unix.opam
@@ -7,6 +7,8 @@ homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
 bug-reports:  "https://github.com/mirage/ocaml-cstruct/issues"
+doc: "https://mirage.githbu.io/ocaml-cstruct/"
+
 tags: [ "org:mirage" "org:ocamllabs" ]
 build: [
   ["dune" "subst"] {pinned}
@@ -16,13 +18,12 @@ depends: [
   "ocaml" {>= "4.03.0"}
   "dune" {build & >= "1.0"}
   "base-unix"
-  "cstruct"
+  "cstruct" {>="3.2.0"}
 ]
 synopsis: "Access C-like structures directly from OCaml"
+
 description: """
 Cstruct is a library and syntax extension to make it easier to access C-like
-structures directly from OCaml.  It supports both reading and writing to these
-structures, and they are accessed via the `Bigarray` module."""
-url {
-  src: "git+https://github.com/mirage/ocaml-cstruct.git"
-}
+structures directly from OCaml. It supports both reading and writing to these
+structures, and they are accessed via the `Bigarray` module.
+"""
diff --git a/cstruct.opam b/cstruct.opam
@@ -7,6 +7,7 @@ homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
 bug-reports:  "https://github.com/mirage/ocaml-cstruct/issues"
+doc: "https://mirage.githbu.io/ocaml-cstruct/"
 tags: [ "org:mirage" "org:ocamllabs" ]
 build: [
   ["dune" "subst"] {pinned}
@@ -24,6 +25,3 @@ description: """
 Cstruct is a library and syntax extension to make it easier to access C-like
 structures directly from OCaml.  It supports both reading and writing to these
 structures, and they are accessed via the `Bigarray` module."""
-url {
-  src: "git+https://github.com/mirage/ocaml-cstruct.git"
-}
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
diff --git a/ppx_cstruct.opam b/ppx_cstruct.opam
@@ -7,6 +7,8 @@ homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
 bug-reports:  "https://github.com/mirage/ocaml-cstruct/issues"
+doc: "https://mirage.githbu.io/ocaml-cstruct/"
+
 tags: [ "org:mirage" "org:ocamllabs" ]
 build: [
   ["dune" "subst"] {pinned}
@@ -29,6 +31,3 @@ description: """
 Cstruct is a library and syntax extension to make it easier to access C-like
 structures directly from OCaml.  It supports both reading and writing to these
 structures, and they are accessed via the `Bigarray` module."""
-url {
-  src: "git+https://github.com/mirage/ocaml-cstruct.git"
-}