switch from ocamlbuild to jbuilder

ocaml-doc · May 18, 2017 · 8047685 · 8047685
1 parent 625b10b
commit 8047685
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ tmp
 *.native
 *.byte
 *.install
+.merlin
diff --git a/Makefile b/Makefile
@@ -1,17 +1,15 @@
 # This makefile is used for dev convenience. It is removed
 # by the distribution process.
 
-.PHONY: lib test doc clean
+.PHONY: build doc clean
 
-lib:
-	topkg build
-
-test:
-	topkg build
-	topkg test
+build:
+	jbuilder build -j16
 
 doc:
-	topkg doc
+	@echo "waiting for jbuilder odoc support"
+	@#topkg doc
 
 clean:
-	topkg clean
+	-rm -R _build
+	-rm octavius.install
diff --git a/_tags b/_tags
diff --git a/opam → octavius.opam b/opam → octavius.opam
@@ -12,9 +12,10 @@ tags: ["doc" "ocamldoc" "org:ocaml-doc"]
 available: [ ocaml-version >= "4.03.0"]
 depends: [
   "ocamlfind" {build}
-  "ocamlbuild" {build}
+  "jbuilder" {build}
   "topkg" {build & >= "0.7.5"} ]
 
-build: [[
-  "ocaml" "pkg/pkg.ml" "build"
-          "--pinned" "%{pinned}%" ]]
+build: [
+  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
diff --git a/pkg/META b/pkg/META
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
@@ -1,10 +1,3 @@
 #!/usr/bin/env ocaml
 #use "topfind"
-#require "topkg"
-open Topkg
-
-let () =
-  Pkg.describe "octavius" @@ fun c ->
-  Ok [ Pkg.lib ~exts:(Exts.ext ".cmi") "src/octTypes";
-       Pkg.mllib "src/octavius.mllib";
-       Pkg.test ~run:false "test/main"]
+#require "topkg-jbuilder.auto"
diff --git a/src/jbuild b/src/jbuild
@@ -0,0 +1,8 @@
+(jbuild_version 1)
+
+(ocamllex  (octLexer))
+(ocamlyacc (octParser))
+
+(library
+ ((name octavius)
+  (public_name octavius)))
diff --git a/src/octTypes.mli → src/octTypes.ml b/src/octTypes.mli → src/octTypes.ml
diff --git a/src/octavius.mllib b/src/octavius.mllib
diff --git a/test/jbuild b/test/jbuild
@@ -0,0 +1,6 @@
+(jbuild_version 1)
+
+(executable
+ ((name main)
+  (public_name octavius)
+  (libraries (octavius))))
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ tmp @@
     *.native
     *.byte
     *.install
+    .merlin