Merge pull request #13 from rgrinberg/jbuilder

Switch to jbuilder
mirage · Jun 20, 2017 · dfeb2cf · dfeb2cf
2 parents 1d3055f + 334b518
commit dfeb2cf
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ tmp
 *.install
 *.native
 *.byte
+.merlin
diff --git a/.merlin b/.merlin
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,6 @@ env:
    - PACKAGE="base64"
    - PRE_INSTALL_HOOK="cd /home/opam/opam-repository && git pull origin master && opam update -u -y"
  matrix:
-   - DISTRO=debian-stable OCAML_VERSION=4.01.0
    - DISTRO=debian-testing OCAML_VERSION=4.02.3
    - DISTRO=debian-unstable OCAML_VERSION=4.03.0
    - DISTRO=ubuntu-16.04 OCAML_VERSION=4.04.0

diff --git a/_tags b/_tags
diff --git a/opam → base64.opam b/opam → base64.opam
@@ -10,15 +10,15 @@ bug-reports: "https://github.com/mirage/ocaml-base64/issues"
 dev-repo: "https://github.com/mirage/ocaml-base64.git"
 depends: [
   "base-bytes"
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build}
+  "jbuilder" {build & >= "1.0+beta10"}
   "bos" {test}
   "rresult" {test}
   "alcotest" {test}
 ]
-build: [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false" ]
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
 build-test: [
-  [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "true" ]
-  [ "ocaml" "pkg/pkg.ml" "test" ]
+  ["jbuilder" "runtest" "-p" name]
 ]
diff --git a/build b/build
diff --git a/doc/api.odocl b/doc/api.odocl
diff --git a/doc/dev.odocl b/doc/dev.odocl
diff --git a/doc/style.css b/doc/style.css
diff --git a/pkg/META b/pkg/META
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
@@ -1,9 +1,2 @@
-#!/usr/bin/env ocaml
 #use "topfind"
-#require "topkg"
-open Topkg
-
-let () =
-  Pkg.describe "base64" @@ fun c ->
-  Ok [ Pkg.mllib "src/b64.mllib";
-       Pkg.test "test/test" ]
+#require "topkg-jbuilder.auto"
diff --git a/src/b64.mllib b/src/b64.mllib
diff --git a/src/jbuild b/src/jbuild
@@ -0,0 +1,7 @@
+(jbuild_version 1)
+
+(library
+ ((name base64)
+  (wrapped false)
+  (public_name base64)
+  (libraries (bytes))))
diff --git a/test/jbuild b/test/jbuild
@@ -0,0 +1,10 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base64 rresult alcotest bos))))
+
+(alias
+ ((name runtest)
+  (deps (test.exe))
+  (action (run ${<}))))
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ tmp @@
     *.install
     *.native
     *.byte
+    .merlin