Switch to jbuilder

Author: chambart

.gitignore

@@ -8,3 +8,4 @@ asm
 */*.o
 */*.byte
 */*.opt
+_build

.merlin

@@ -0,0 +1,5 @@
+0.1
+
+------------
+
+* Initial release

CHANGES.md

@@ -1,83 +1,24 @@
-COMPILE_ARG=-g -bin-annot -annot -keep-locs -w +a-37 -warn-error +a
-COMPILE_OPT_ARG=$(COMPILE_ARG)
+INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),)
 
-all: natdynlink
+# Default rule
+default:
+	jbuilder build @install
 
-byte: lib/nullable_array.cma
-native: lib/nullable_array.cmxa byte
-natdynlink: lib/nullable_array.cmxs native
+test:
+	jbuilder runtest
 
-lib/nullable_array.cmi: lib/nullable_array.mli
-	ocamlc $(COMPILE_ARG) -c $< -o $@
-
-lib/nullable_array.cmo: lib/nullable_array.ml lib/nullable_array.cmi
-	ocamlc $(COMPILE_ARG) -I lib -c $< -o $@
-
-lib/nullable_array.cmx: lib/nullable_array.ml lib/nullable_array.cmi
-	ocamlopt $(COMPILE_OPT_ARG) -I lib -c $< -o $@
-
-lib/nullable_array.cmxa: lib/nullable_array.cmx
-	ocamlopt $(COMPILE_OPT_ARG) -I lib -a $? -o $@
-
-lib/nullable_array.cmxs: lib/nullable_array.cmx
-	ocamlopt $(COMPILE_OPT_ARG) -I lib -shared $? -o $@
-
-lib/nullable_array.cma: lib/nullable_array.cmo
-	ocamlc $(COMPILE_ARG) -I lib -a $? -o $@
-
-clean::
-	rm -f lib/*.a lib/*.o lib/*.cma lib/*.cmo lib/*.cmx lib/*.cmi \
-	      lib/*.cmxa lib/*.cmxs lib/*.cmt lib/*.cmti lib/*.annot
-
-TEST_COMPILE_ARG=-g -I lib -I test -w +a
-
-test: test_native
-
-test_byte: test/basic.byte test/basic_float.byte
-test_native: test_byte test/basic.opt test/basic_float.opt
-
-test/basic.byte: test/basic.mli test/basic.ml byte
-	ocamlc $(TEST_COMPILE_ARG) lib/nullable_array.cma test/basic.mli test/basic.ml -o $@
-	$@
-
-test/basic.opt: test/basic.mli test/basic.ml native
-	ocamlopt $(TEST_COMPILE_ARG) lib/nullable_array.cmxa test/basic.mli test/basic.ml -o $@
-	$@
-
-test/basic_float.byte: test/basic_float.mli test/basic_float.ml byte
-	ocamlc $(TEST_COMPILE_ARG) lib/nullable_array.cma test/basic_float.mli test/basic_float.ml -o $@
-	$@
-
-test/basic_float.opt: test/basic_float.mli test/basic_float.ml native
-	ocamlopt $(TEST_COMPILE_ARG) lib/nullable_array.cmxa test/basic_float.mli test/basic_float.ml -o $@
-	$@
-
-html:
-	mkdir -p html
-
-html_doc: lib/nullable_array.mli | html
-	ocamldoc -html -d html/ $?
-
-man:
-	mkdir -p man
-
-man_doc: lib/nullable_array.mli | man
-	ocamldoc -man -man-mini -d man/ $?
-
-doc: man_doc html_doc
-
-clean::
-	rm -f test/*.a test/*.o test/*.cma test/*.cmo test/*.cmx test/*.cmi \
-	      test/*.cmxa test/*.cmxs test/*.cmt test/*.cmti test/*.annot \
-	      html/* man/* test/*.byte test/*.opt
-	rmdir -p html man
+dev:
+	jbuilder build --dev @install
 
 install:
-	ocamlfind install nullable_array META \
-	  lib/*.a lib/*.o lib/*.cma lib/*.cmo lib/*.cmx lib/*.cmi \
-	  lib/*.cmxa lib/*.cmxs lib/*.cmt lib/*.cmti lib/*.annot
+	jbuilder install $(INSTALL_ARGS)
 
 uninstall:
-	ocamlfind remove nullable_array
+	jbuilder uninstall $(INSTALL_ARGS)
+
+reinstall: uninstall reinstall
+
+clean:
+	rm -rf _build
 
-.PHONY: all html_doc man_doc doc install uninstall clean
+.PHONY: default test dev install uninstall reinstall clean

Makefile

@@ -0,0 +1,7 @@
+(jbuild_version 1)
+
+(library
+ ((name        nullable_array)
+  (public_name nullable-array)
+  (modules (nullable_array))
+  (flags (:standard "-keep-docs" "-keep-locs"))))

lib/jbuild

@@ -77,6 +77,7 @@
 
 *)
 
+[@@@ocaml.warning "-37"] (* The type elt is never built *)
 
 type elt =
   | Constant

lib/nullable_array.ml

@@ -1,7 +1,7 @@
 (************************************************************************)
 (*  nullable-array                                                      *)
 (*                                                                      *)
-(*    Copyright 2016 OCamlPro                                           *)
+(*    Copyright 2016-2017 OCamlPro                                      *)
 (*                                                                      *)
 (*  This file is distributed under the terms of the MIT License         *)
 (*                                                                      *)

lib/nullable_array.mli

@@ -9,25 +9,20 @@ license: "MIT"
 dev-repo: "https://github.com/OCamlPro/ocplib-nullable-array.git"
 
 build: [
-  [make "byte"]
-  [make "native"] { ocaml-native }
-  [make "natdynlink"] { ocaml-native-dynlink }
+  ["jbuilder" "build" "--only-packages" "nullable-array" "--root" "." "-j" jobs "@install"]
 ]
 
 build-test: [
-  [make "test_byte"]
-  [make "test_native"] { ocaml-native }
-]
-
-build-doc: [
-  [make "doc"]
+  ["jbuilder" "runtest"]
 ]
 
 install: [] (* no install rules: done through a .install file *)
 
 available: [
   ocaml-version >= "4.02"   (* use -keep-locs and attributes *)
-  & ocaml-version <= "4.04" (* need to be tested before announcing that a version is correct *)
+  & ocaml-version <= "4.05" (* need to be tested before announcing that a version is correct *)
 ]
 
-depends: []
+depends: [
+  "jbuilder" {build & >= "1.0+beta8"}
+]

opam nullable-array.opamopam renamed to nullable-array.opam

@@ -0,0 +1,31 @@
+(jbuild_version 1)
+
+(executables
+ ((names (basic))
+  (modules (basic))
+  (libraries (nullable_array))))
+
+(alias
+ ((name    runtest)
+  (deps    (basic.exe))
+  (action  (run ${<}))))
+
+(alias
+ ((name    runtest)
+  (deps    (basic.bc))
+  (action  (run ${<}))))
+
+(executables
+ ((names (basic_float))
+  (modules (basic_float))
+  (libraries (nullable_array))))
+
+(alias
+ ((name    runtest)
+  (deps    (basic_float.exe))
+  (action  (run ${<}))))
+
+(alias
+ ((name    runtest)
+  (deps    (basic_float.bc))
+  (action  (run ${<}))))