switch from ocamlbuild to jbuilder

trefis · trefis · commit ca022072002e · 2017-05-18T13:47:07.000+01:00
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 doc-ock-html.install
diff --git a/_tags b/_tags
diff --git a/doc-ock-html.opam b/doc-ock-html.opam
@@ -5,18 +5,18 @@ homepage:  "https://github.com/ocaml-doc/doc-ock-html"
 doc: "https://ocaml-doc.github.com/doc-ock-html/"
 license: "ISC"
 dev-repo: "http://github.com/ocaml-doc/doc-ock-html.git"
-bug-reports: "https://github.com/ocaml-doc/doc-ock-html/issues"
+bug-reports: "https://github.com/ocaml-doc/odoc/issues"
 tags: ["doc" "html" "ocaml" "org:ocaml-doc"]
 
-available: [ ocaml-version >= "4.02.3" ]
+available: [ ocaml-version >= "4.03.0" ]
 depends: [
   "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build & >= "0.7.5"}
+  "jbuilder" {build}
   "doc-ock"
   "tyxml" {>= "4.0.0" }
   "xmlm" ]
 
-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,8 +1,3 @@
 #!/usr/bin/env ocaml
 #use "topfind"
-#require "topkg"
-open Topkg
-
-let () =
-  Pkg.describe "doc-ock-html" @@ fun c ->
-  Ok [ Pkg.mllib "src/doc-ock-html.mllib" ]
+#require "topkg-jbuilder.auto"
diff --git a/src/doc-ock-html.mllib b/src/doc-ock-html.mllib
diff --git a/src/docOckHtmlHtml_tree.ml b/src/docOckHtmlHtml_tree.ml
@@ -220,7 +220,7 @@ class page_creator ?kind ~path content =
         meta ~a:[ a_name "viewport";
                   a_content "width=device-width,initial-scale=1.0"; ] ();
         meta ~a:[ a_name "generator";
-                  a_content "doc-ock-html %%VERSION%%" ] ();
+                  a_content "doc-ock-html v1.0.0-1-g1fc9bf0" ] ();
       ]
 
     method heading : Html_types.h1_content_fun elt list =
diff --git a/src/jbuild b/src/jbuild
@@ -0,0 +1,7 @@
+(jbuild_version 1)
+
+(library
+ ((name docOckHtml)
+  (public_name doc-ock-html)
+  (libraries (doc-ock xmlm tyxml))
+  (flags (:standard -open StdLabels))))

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ class page_creator ?kind ~path content =`
`220`	`220`	`meta ~a:[ a_name "viewport";`
`221`	`221`	`a_content "width=device-width,initial-scale=1.0"; ] ();`
`222`	`222`	`meta ~a:[ a_name "generator";`
`223`		`- a_content "doc-ock-html %%VERSION%%" ] ();`
	`223`	`+ a_content "doc-ock-html v1.0.0-1-g1fc9bf0" ] ();`
`224`	`224`	`]`
`225`	`225`
`226`	`226`	`method heading : Html_types.h1_content_fun elt list =`