Merge pull request simonjbeaumont#1 from psafont/dune

Dunify project

.gitignore

@@ -1,8 +1,5 @@
 _build
-setup.data
-setup.log
-*.native
-*.byte
-*.docdir
+.merlin
+*.install
 .coverage/
 .gh-pages/

.travis.yml

@@ -1,15 +1,25 @@
 language: c
-sudo: required
-dist: trusty
-branches:
-  only: master
+os: linux
+dist: xenial
 install:
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
-  - wget https://raw.githubusercontent.com/simonjbeaumont/ocaml-travisci-skeleton/docgen/.travis-docgen.sh
-  - wget https://raw.githubusercontent.com/simonjbeaumont/ocaml-travis-coveralls/master/travis-coveralls.sh
-script: bash -ex .travis-opam.sh && bash -ex .travis-docgen.sh && bash -ex travis-coveralls.sh
+  - wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
+script: bash -ex .travis-opam.sh
+jobs:
+  include:
+    - env: OCAML_VERSION=4.08
+    - env: OCAML_VERSION=4.10
 env:
   global:
-  - OCAML_VERSION=4.02 TESTS=true
-  - COV_CONF="./configure --enable-tests"
   - secure: jgNNAbrODFH0dyZLrXD/zSI/U4luCwalj/Lqoz3IRMXwscshmIQDcp0KCghh6s65qCuMDlVjVwM8Kn+wftY40HRuuf+XA6hMpH8Jmbr4Qi3l5EnotLS4AH/GWhu/nP3F3MbaML+kUgg0GeH19qZ4npteefhDcONxw6xtvIR/6rg=
+  - PACKAGE="pci"
+
+deploy:
+  provider: pages:git
+  local_dir: $TRAVIS_BUILD_DIR/_build/default/_doc/_html
+  token: $GITHUB_TOKEN
+  keep_history: true
+  target_branch: gh_pages
+  on:
+    branch: master
+    condition: $OCAML_VERSION = 4.10
+  edge: true

Makefile

@@ -1,46 +1,19 @@
-# OASIS_START
-# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
-
-SETUP = ocaml setup.ml
-
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
-
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
-
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
+.PHONY: all test clean
 
 all:
-	$(SETUP) -all $(ALLFLAGS)
+	dune build --profile=release
 
-install: setup.data
-	$(SETUP) -install $(INSTALLFLAGS)
+test:
+	dune runtest -p pci
 
-uninstall: setup.data
-	$(SETUP) -uninstall $(UNINSTALLFLAGS)
+install:
+	dune install pci
 
-reinstall: setup.data
-	$(SETUP) -reinstall $(REINSTALLFLAGS)
+doc:
+	dune build -p pci @doc
 
 clean:
-	$(SETUP) -clean $(CLEANFLAGS)
-
-distclean:
-	$(SETUP) -distclean $(DISTCLEANFLAGS)
-
-setup.data:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
-
-configure:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
-
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
-
-# OASIS_STOP
-gh-pages:
-	bash .docgen.sh
+	dune clean
 
 travis-coveralls.sh:
 	wget https://raw.githubusercontent.com/simonjbeaumont/ocaml-travis-coveralls/master/$@

README.md

@@ -25,7 +25,6 @@ The easiest way to install this library is to use `opam`:
 However, if you don't use `opam`, you can compile from source by cloning this
 repo and executing the usual dance:
 
-    ./configure
     make
     make install
 

bindings/dune

@@ -0,0 +1,5 @@
+(library
+  (name pci_bindings)
+  (public_name pci.bindings)
+  (libraries ctypes.stubs ctypes ctypes.foreign.threaded)
+)

dune-project

@@ -0,0 +1 @@
+(lang dune 2.0)

examples/dune

@@ -0,0 +1,4 @@
+(executable
+  (name lspci)
+  (libraries pci)
+)

lib/dune

@@ -0,0 +1,25 @@
+(rule
+  (targets ffi_generated.ml)
+  (deps ../stubgen/ffi_stubgen.exe)
+  (action (with-stdout-to %{targets} (bash "%{deps} -ml")))
+)
+
+(rule
+  (targets ffi_generated_stubs.c)
+  (deps ../stubgen/ffi_stubgen.exe)
+  (action (with-stdout-to %{targets} (bash "%{deps} -c")))
+)
+
+(rule
+  (targets ffi_generated_types.ml)
+  (deps ../stubgen/ffi_ml_types_stubgen.exe)
+  (action (with-stdout-to %{targets} (bash "%{deps} -c")))
+)
+
+(library
+  (name pci)
+  (public_name pci)
+  (foreign_stubs (language c) (names ffi_generated_stubs) (flags -lpci))
+  (c_library_flags -lpci)
+  (libraries pci_bindings ctypes.stubs)
+)