switch to jbuilder

.gitignore

@@ -1,6 +1,8 @@
-_build/
+_build
+**/*.merlin
+*.install
 /ocaml-usb-*.tar.gz
-/setup.data
-/setup.log
-/setup.exe
-/setup-dev.exe
+
+
+
+

Makefile

@@ -1,59 +1,5 @@
-# Makefile
-# --------
-# Copyright : (c) 2012, Jeremie Dimino <[email protected]>
-# Licence   : BSD3
-#
-# Generic Makefile for oasis project
+all:
+	jbuilder build @install @runtest
 
-# Set to setup.exe for the release
-SETUP := setup-dev.exe
-
-# Default rule
-default: build
-
-# Setup for the development version
-setup-dev.exe: _oasis setup.ml
-	sed '/^#/D' setup.ml > setup_dev.ml
-	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || \
-	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || true
-	rm -f setup_dev.*
-
-# Setup for the release
-setup.exe: setup.ml
-	ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
-	rm -f setup.cmx setup.cmi setup.o setup.obj setup.cmo
-
-build: $(SETUP) setup.data
-	./$(SETUP) -build $(BUILDFLAGS)
-
-doc: $(SETUP) setup.data build
-	./$(SETUP) -doc $(DOCFLAGS)
-
-test: $(SETUP) setup.data build
-	./$(SETUP) -test $(TESTFLAGS)
-
-all: $(SETUP)
-	./$(SETUP) -all $(ALLFLAGS)
-
-install: $(SETUP) setup.data
-	./$(SETUP) -install $(INSTALLFLAGS)
-
-uninstall: $(SETUP) setup.data
-	./$(SETUP) -uninstall $(UNINSTALLFLAGS)
-
-reinstall: $(SETUP) setup.data
-	./$(SETUP) -reinstall $(REINSTALLFLAGS)
-
-clean: $(SETUP)
-	./$(SETUP) -clean $(CLEANFLAGS)
-
-distclean: $(SETUP)
-	./$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-configure: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-setup.data: $(SETUP)
-	./$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: default build doc test all install uninstall reinstall clean distclean configure
+clean:
+	rm -rf _build

examples/jbuild

@@ -0,0 +1,4 @@
+(executable
+ ((name list_devices)
+  (public_name ocaml-usb-list-devices)
+  (libraries (usb))))

examples/list_devices.ml

@@ -7,10 +7,8 @@
  * This file is a part of ocaml-usb.
  *)
 
-open Lwt
-
-let _ =
+let () =
   List.iter
     (fun dev ->
-       Printf.printf "Bus %03d Device %03d\n" (USB.get_bus_number dev) (USB.get_device_address dev))
-    (USB.get_device_list ())
+       Printf.printf "Bus %03d Device %03d\n" (Usb.get_bus_number dev) (Usb.get_device_address dev))
+    (Usb.get_device_list ())