Merge pull request #2 from issuu/dunify

Dunify

Author: Calsign

.gitignore

@@ -1,16 +1,7 @@
 _build
 __pycache__
-gen
-*.docdir
-
-*.cmo
-*.cma
-*.cmi
-*.out
-*.cmx
-*.native
-*.byte
 
+.merlin
 *.swp
 *~
 \#*\#

.merlin

@@ -1,86 +1,16 @@
-BUILD=_build
+build:
+	dune build
 
-# By default (if left blank), the generator script searches for
-# the opencv4 headers in /usr/include/ and /usr/local/include/.
-# Set this variable if your opencv4 headers are located elsewhere.
-SYSTEM_INCLUDE_DIR=
+install:
+	dune install
 
-GEN=gen
-GENERATOR=generator.py
-GENERATOR_SRC=$(GENERATOR) hdr_parser.py type_manager.py incl/*
+uninstall:
+	dune uninstall
 
-CPP=$(GEN)/opencv.cpp glue.cpp
-HEADERS=$(GEN)/opencv.h glue.h
-SHARED_LIB=libocamlopencv.so
-SHARED_LIBS_INSTALL_DIR=/usr/lib/
-INSTALLED_SHARED_LIB=$(SHARED_LIBS_INSTALL_DIR)/$(SHARED_LIB)
+run:
+	dune build @run
 
-MLS=$(GEN)/opencv
-FLAGS=-use-ocamlfind
+doc:
+	dune build @doc
 
-LIB_NAME=opencv
-LIB_FILES=META $(BUILD)/$(GEN)/opencv.cmxa $(BUILD)/$(GEN)/*.cmx \
-	$(BUILD)/$(GEN)/*.cmi $(BUILD)/$(GEN)/*.a $(BUILD)/$(GEN)/*.cma
-NATIVE_LIB=$(GEN)/opencv.cmxa
-BYTE_LIB=$(GEN)/opencv.cma
-BUILT_LIBS=$(BUILD)/$(NATIVE_LIB) $(BUILD)/$(BYTE_LIB)
-
-DEMOS=$(wildcard demos/*)
-DEMOS_CLEAN=$(DEMOS:=.clean)
-
-default: install
-
-$(GEN)/%: ${GENERATOR_SRC}
-	@echo "Running generator script"
-	mkdir -p $(GEN)
-	./$(GENERATOR) $(GEN) $(SYSTEM_INCLUDE_DIR)
-
-$(BUILD)/$(SHARED_LIB): $(CPP) $(HEADERS)
-	@echo "Compiling shared library"
-	mkdir -p $(BUILD)
-	g++ --shared -fPIC -g -std=c++11 -pedantic -Werror -Wall $(CPP) \
-		-I `ocamlc -where` `pkg-config --libs --cflags opencv4` \
-		-o $(BUILD)/$(SHARED_LIB)
-	chmod 755 $(BUILD)/$(SHARED_LIB)
-
-$(BUILT_LIBS): $(BUILD)/$(SHARED_LIB) $(MLS:=.ml) $(MLS:=.mli)
-	@echo "Building opencv OCaml library"
-	ocamlbuild $(FLAGS) $(NATIVE_LIB) $(BYTE_LIB)
-
-$(INSTALLED_SHARED_LIB): $(BUILD)/$(SHARED_LIB)
-	@echo "Installing shared library"
-#	needing sudo is unfortunate but we need to put the shared library
-#	somewhere that the linker will find it
-	sudo rm -f $(INSTALLED_SHARED_LIB)
-	sudo cp $(BUILD)/$(SHARED_LIB) $(INSTALLED_SHARED_LIB)
-
-libinstall: $(BUILT_LIBS)
-	@echo "Installing ocamlfind library"
-	ocamlfind remove $(LIB_NAME)
-	ocamlfind install $(LIB_NAME) $(LIB_FILES)
-
-sharedlib: $(BUILD)/$(SHARED_LIB)
-lib: $(BUILT_LIBS)
-install: $(INSTALLED_SHARED_LIB) libinstall
-
-docs: $(BUILT_LIBS)
-	ocamlbuild $(FLAGS) -docflags -stars opencv.docdir/index.html
-
-$(DEMOS): $(INSTALLED_SHARED_LIB) libinstall
-	@echo "Running demo: $@"
-#	clean first to guarantee that we pick up changes to the library
-	$(MAKE) -C $@ clean run
-
-$(DEMOS_CLEAN):
-#	this is a stupid hack
-	$(MAKE) -C $(basename $@) clean
-
-clean: $(DEMOS_CLEAN)
-	ocamlbuild -clean
-	rm -f $(BUILD)/$(SHARED_LIB)
-	rm -rf $(GEN)
-	sudo rm -f $(INSTALLED_SHARED_LIB)
-	ocamlfind remove $(LIB_NAME)
-
-.PHONY: default sharedlib lib libinstall install docs clean \
-	$(DEMOS) $(DEMOS_CLEAN)
+.PHONY: build install uninstall run doc

META

@@ -3,18 +3,23 @@
 
 ## Quick start
 
-Run `make` to install the library with ocamlfind. You must have OpenCV
+Run `make install` to install the library with dune. You must have OpenCV
 installed on your system.
 
-Run `make demos/basic` to run the demo. This demo requires you to
+Run `make run` to run the demo. This demo requires you to
 provide a video file `demos/basic/test.mp4` as input. It also requires
 you to install the `owl` opam package.
 
-Run `make docs` to generate documentation. Open
-`opencv.docdir/index.html` to view. Alternatively, view the
+Run `make doc` to generate documentation. Open
+`_build/default/_doc/_html/index.html` to view. Alternatively, view the
 auto-generated docs online:
 [API](https://calsign.github.io/ocaml-opencv/).
 
+## Pinning the dev repo
+To build and insstall the package directly from the development
+repository, use
+`opam pin add opencv https://github.com/Calsign/ocaml-opencv.git`
+
 ## Goals
 
  - Provide access to the full OpenCV API through OCaml

Makefile

@@ -0,0 +1,20 @@
+module C = Configurator.V1
+
+let () =
+C.main ~name:"opencv" (fun c ->
+let default : C.Pkg_config.package_conf =
+  { libs   = []
+  ; cflags = []
+  }
+in
+let conf =
+  match C.Pkg_config.get c with
+  | None -> default
+  | Some pc ->
+     match (C.Pkg_config.query pc ~package:"opencv4") with
+     | None -> default
+     | Some deps -> deps
+in
+
+C.Flags.write_sexp "c_flags.sexp"         conf.cflags;
+C.Flags.write_sexp "c_library_flags.sexp" conf.libs)

README.md

@@ -0,0 +1,3 @@
+(executable
+ (name discover)
+ (libraries dune-configurator))

_tags

@@ -0,0 +1,8 @@
+(executable
+ (name basic)
+ (libraries owl opencv)
+)
+
+(rule
+ (alias run)
+ (action (run %{exe:basic.exe})))