Convert to topkg build.

haesbaert · haesbaert · commit 769bc44921da · 2017-04-16T23:38:16.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 *.byte
 *.native
-*.cma
 _build
+rawlink.install
diff --git a/.travis.yml b/.travis.yml
@@ -8,11 +8,19 @@ env:
   global:
   - PACKAGE="rawlink.9999"
   matrix:
-  - DISTRO="debian-stable" OCAML_VERSION="4.02.3"
-  - DISTRO="debian-testing" OCAML_VERSION="4.03.0"
-  - DISTRO="ubuntu-14.04" OCAML_VERSION="4.02.3"
-  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.02.3"
-  - DISTRO="centos-7" OCAML_VERSION="4.02.3"
-  - DISTRO="centos-6" OCAML_VERSION="4.02.3"
   - DISTRO="alpine-3.4" OCAML_VERSION="4.03.0"
+  - DISTRO="alpine-3.4" OCAML_VERSION="4.04.0"
+  - DISTRO="centos-6" OCAML_VERSION="4.03.0"
+  - DISTRO="centos-6" OCAML_VERSION="4.04.0"
+  - DISTRO="centos-7" OCAML_VERSION="4.03.0"
+  - DISTRO="centos-7" OCAML_VERSION="4.04.0"
+  - DISTRO="debian-stable" OCAML_VERSION="4.03.0"
+  - DISTRO="debian-stable" OCAML_VERSION="4.04.0"
+  - DISTRO="debian-testing" OCAML_VERSION="4.03.0"
+  - DISTRO="debian-testing" OCAML_VERSION="4.04.0"
   - DISTRO="fedora-24" OCAML_VERSION="4.03.0"
+  - DISTRO="fedora-24" OCAML_VERSION="4.04.0"
+  - DISTRO="ubuntu-14.04" OCAML_VERSION="4.03.0"
+  - DISTRO="ubuntu-14.04" OCAML_VERSION="4.04.0"
+  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.03.0"
+  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.04.0"
diff --git a/CHANGES.md b/CHANGES.md
@@ -0,0 +1,20 @@
+## 0.5 (2017-04-16)
+
+* Convert to topkg
+
+## 0.4 (2016-12-17)
+
+* Convert to ppx
+
+## 0.3 (2015-08-30)
+
+* Fix fd leak in bpf_open
+* Fix linux send function
+
+## 0.2 (2015-08-28)
+
+* Fix to bpf_split_buf
+
+## 0.1 (2015-10-09)
+
+* Initial release
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/README.md b/README.md
@@ -1,6 +1,4 @@
-# Rawlink
-
-A portable library to read and write raw packets.
+## Rawlink - portable library to read and write raw packets.
 
 [![Build Status](https://travis-ci.org/haesbaert/rawlink.svg)](https://travis-ci.org/haesbaert/rawlink)
 
diff --git a/_tags b/_tags
@@ -1,7 +1,6 @@
-true: debug, bin_annot, strict_sequence
-true: package(cstruct), package(cstruct.ppx)
-true: package(lwt.unix), package(lwt.ppx), ppopt(-lwt-debug)
+true: color(auto), debug, bin_annot, strict_sequence
+true: package(cstruct cstruct.ppx lwt.unix lwt.ppx)
 true: use_rawlink_stubs
-
+"lib": include
 <*.byte>: linkdep(rawlink_stubs.o), custom
 <*.native>: linkdep(rawlink_stubs.o)
diff --git a/all.itarget b/all.itarget
diff --git a/build.sh b/build.sh
@@ -15,4 +15,4 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-ocamlbuild -no-links -use-ocamlfind all.otarget $@
+topkg build
diff --git a/doc/api.odocl b/doc/api.odocl
@@ -0,0 +1,2 @@
+Rawlink
+Lwt_rawlink
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
@@ -19,13 +19,12 @@ dispatch begin function
   | After_rules ->
     pflag ["ocaml";"compile";] "ppopt" (fun s -> S [A"-ppopt"; A s]);
     pflag ["ocaml";"ocamldep";] "ppopt" (fun s -> S [A"-ppopt"; A s]);
-    pdep ["link"] "linkdep" (fun param -> [param]);
     (* Linking generated stubs *)
     dep ["ocaml"; "link"; "byte"; "library"; "use_rawlink_stubs"]
       ["lib/dllrawlink_stubs"-.-(!Options.ext_dll)];
     flag ["ocaml"; "link"; "byte"; "library"; "use_rawlink_stubs"] &
     S[A"-dllib"; A"-lrawlink_stubs"];
-
+    pdep ["link"] "linkdep" (fun param -> [param]);
     dep ["ocaml"; "link"; "native"; "library"; "use_rawlink_stubs"]
       ["lib/librawlink_stubs"-.-(!Options.ext_lib)];
     flag ["ocaml"; "link"; "native"; "library"; "use_rawlink_stubs"] &
diff --git a/opam b/opam
@@ -1,19 +1,20 @@
 opam-version: "1.2"
 name: "rawlink"
-version: "0.4"
 maintainer: "Christiano F. Haesbaert <haesbaert@haesbaert.org>"
 authors: "Christiano F. Haesbaert <haesbaert@haesbaert.org>"
+license: "ISC"
 homepage: "https://github.com/haesbaert/rawlink"
 bug-reports: "https://github.com/haesbaert/rawlink/issues"
-license: "ISC"
 dev-repo: "https://github.com/haesbaert/rawlink.git"
-build: ["sh" "build.sh"]
+doc: "https://haesbaert.github.io/rawlink/api"
+build: [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" ]
 depends: [
   "ocamlfind" {build}
+  "topkg" {build}
   "lwt" {>= "2.4.7"}
   "cstruct" {>= "1.9"}
   "ocamlbuild" {build}
 ]
 depexts: [[ ["alpine"] ["linux-headers"] ]]
-available: [ocaml-version >= "4.02.3"]
+available: [ocaml-version >= "4.03.0"]
 
diff --git a/pkg/META b/pkg/META
@@ -1,9 +1,10 @@
-version = "0.4"
+version = "%%VERSION_NUM%%"
 description = "Rawlink is a portable interface to BPF/AF_SOCKET"
 requires = "unix lwt.unix lwt cstruct cstruct.ppx"
 archive(byte) = "rawlink.cma"
+plugin(byte) = "rawlink.cma"
 archive(byte, plugin) = "rawlink.cma"
 archive(native) = "rawlink.cmxa"
-archive(native, plugin) = "rawlink.cmxs"
+plugin(native) = "rawlink.cmxs"
 exists_if = "rawlink.cma"
 
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
@@ -0,0 +1,14 @@
+#!/usr/bin/env ocaml
+#use "topfind"
+#require "topkg"
+open Topkg
+
+let () =
+  let opams =
+    [ Pkg.opam_file "opam" ~lint_deps_excluding:(Some ["ppx_tools" ; "ppx_sexp_conv"]) ]
+  in
+  Pkg.describe ~opams "rawlink" @@ fun _ ->
+  Ok [
+    Pkg.clib "lib/librawlink_stubs.clib";
+    Pkg.mllib "lib/rawlink.mllib";
+  ];
diff --git a/rawlink.install b/rawlink.install

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 *.byte
 *.native
 -*.cma
 _build
 +rawlink.install
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.`
`16`	`16`	`#`
`17`	`17`
`18`		`-ocamlbuild -no-links -use-ocamlfind all.otarget $@`
	`18`	`+topkg build`