ipaddr-sexp and macaddr-sexp packages

ipaddr-sexp.opam

@@ -0,0 +1,26 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"]
+synopsis: "A library for manipulation of IP (and MAC) address representations"
+description: """
+Sexp convertions for ipaddr
+"""
+
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-ipaddr"
+doc: "https://mirage.github.io/ocaml-ipaddr/"
+bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
+depends: [
+  "ocaml" {>= "4.04.0"}
+  "dune" {build}
+  "ipaddr"
+  "ounit" {with-test}
+  "ppx_sexp_conv" {>= "v0.9.0"}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"

ipaddr.opam

@@ -30,9 +30,8 @@ depends: [
   "ocaml" {>= "4.04.0"}
   "dune" {build}
   "macaddr"
-  "sexplib0"
   "ounit" {with-test}
-  "ppx_sexp_conv" {with-test}
+  "ppx_sexp_conv" {with-test & >= "v0.9.0"}
 ]
 build: [
   ["dune" "subst"] {pinned}

lib/dune

@@ -11,14 +11,16 @@
 
 (library
  (name        ipaddr_sexp)
- (public_name ipaddr.sexp)
+ (public_name ipaddr-sexp)
  (modules ipaddr_sexp)
+ (preprocess (pps ppx_sexp_conv))
  (libraries ipaddr sexplib0))
 
 (library
  (name        macaddr_sexp)
- (public_name macaddr.sexp)
+ (public_name macaddr-sexp)
  (modules macaddr_sexp)
+ (preprocess (pps ppx_sexp_conv))
  (libraries macaddr sexplib0))
 
 (library

lib_test/dune

@@ -1,19 +1,34 @@
-(executables
- (names test_ipaddr test_macaddr test_ppx)
+(rule (copy# ../lib/ipaddr_sexp.ml ipaddr_sexp.ml))
+(rule (copy# ../lib/macaddr_sexp.ml macaddr_sexp.ml))
+
+(library
+ (name test_macaddr_sexp)
+ (wrapped false)
+ (modules macaddr_sexp)
+ (preprocess (pps ppx_sexp_conv))
+ (libraries macaddr sexplib0))
+
+(library
+ (name test_ipaddr_sexp)
+ (wrapped false)
+ (modules ipaddr_sexp)
  (preprocess (pps ppx_sexp_conv))
- (libraries ipaddr oUnit ipaddr.sexp macaddr.sexp))
+ (libraries ipaddr sexplib0))
 
-(alias
- (name    runtest)
- (deps    test_ppx.exe)
- (action  (run %{deps})))
+(test
+ (name test_ipaddr)
+ (package ipaddr)
+ (modules test_ipaddr)
+ (libraries ipaddr test_ipaddr_sexp oUnit))
 
-(alias
- (name    runtest)
- (deps    test_macaddr.exe)
- (action  (run %{deps})))
+(test
+ (name test_macaddr)
+ (package macaddr)
+ (modules test_macaddr)
+ (libraries macaddr test_macaddr_sexp oUnit))
 
-(alias
- (name    runtest)
- (deps    test_ipaddr.exe)
- (action  (run %{deps})))
+(test
+ (name test_ppx)
+ (modules test_ppx)
+ (package ipaddr)
+ (libraries ipaddr macaddr test_ipaddr_sexp test_macaddr_sexp oUnit))

macaddr-sexp.opam

@@ -0,0 +1,26 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"]
+synopsis: "A library for manipulation of MAC address representations"
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-ipaddr"
+doc: "https://mirage.github.io/ocaml-ipaddr/"
+bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
+depends: [
+  "ocaml" {>= "4.04.0"}
+  "dune" {build}
+  "macaddr"
+  "ounit" {with-test}
+  "ppx_sexp_conv" {>= "v0.9.0"}
+]
+conflicts: [ "ipaddr" {< "3.0.0"} ]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-ipaddr.git"
+description: """
+Sexp convertions for macaddr
+"""

macaddr.opam

@@ -10,9 +10,8 @@ bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
 depends: [
   "ocaml" {>= "4.04.0"}
   "dune" {build}
-  "sexplib0"
   "ounit" {with-test}
-  "ppx_sexp_conv" {with-test}
+  "ppx_sexp_conv" {with-test & >= "v0.9.0"}
 ]
 conflicts: [ "ipaddr" {< "3.0.0"} ]
 build: [