Skip to content

Commit

Permalink
Merge pull request #16 from ocaml-community/dunification
Browse files Browse the repository at this point in the history
Dunification
  • Loading branch information
Freyr666 authored Jul 4, 2019
2 parents 46d2d79 + 78a7b83 commit 59c9316
Show file tree
Hide file tree
Showing 163 changed files with 2,438 additions and 2,076 deletions.
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
_build/
/obus-*.tar.gz
/setup.data
/setup.log
/setup.exe
/setup-dev.exe
/man/*.gz
/src/oBus_config.ml
/manual/manual.{aux,log,toc,pdf,out}
.merlin
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ script: bash -ex .travis-opam.sh
sudo: required
env:
matrix:
- OCAML_VERSION=4.02
- OCAML_VERSION=4.04
- OCAML_VERSION=4.05
- OCAML_VERSION=4.06
- OCAML_VERSION=4.07
- OCAML_VERSION=4.08
os:
- linux
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
1.2.0 (2019-07-04)
------------------

* opam: add dependency on `menhir`, `ppxlib`
* opam: remove dependency on `camlp4`, `lwt_camlp4`
* switch to dune build system
* replace Camlp4-based parser with the one generated by Menhir
* remove all Camlp4 dependencies
* replace Camlp4-based syntax module with obus.ppx

1.1.8 (2018-06-02)
------------------

Expand Down
59 changes: 0 additions & 59 deletions Makefile

This file was deleted.

28 changes: 7 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,11 @@ very simple to fully exploit the asynchronous nature of D-Bus.
Dependencies
------------

* [OCaml](http://caml.inria.fr/ocaml/) (>= 3.12)
* [findlib](http://projects.camlcity.org/projects/findlib.html)
* [react](http://erratique.ch/software/react)
* [lwt](http://ocsigen.org/lwt/) (>= 2.4.0) built with react support
* [type-conv](http://bitbucket.org/yminsky/ocaml-core)
* [xmlm](http://erratique.ch/software/xmlm)
Make sure you have [dune](https://dune.build/)
installed, and install all the missing dependencies listed in
the output of this command:

For building the development version, you also need to install
[oasis](http://oasis.forge.ocamlcore.org/) (>= 0.3.0).
$ dune external-lib-deps @install --missing

Installation
------------
Expand All @@ -32,31 +28,21 @@ Manual installation from sources

To build and install obus:

$ ./configure
$ make
$ make install

### Documentation and manual pages _(optional)_

To build the documentation:

$ make doc

It will then be installed by `make install`.
$ dune build @install

### Tests _(optionnal)_

To build and execute tests:

$ ./configure --enable-tests
$ make test
$ dune runtest

Using the library
-----------------

OBus install the following packages:

* `obus`: the core library, implementing the D-Bus protocol,
* `obus.ppx`: syntax extensions to aid registering OBus exceptions.
* `obus.notification`: interface to the freedesktop Notification
service,
* `obus.hal`: interface to the freedesktop Hal service,
Expand Down
Loading

0 comments on commit 59c9316

Please sign in to comment.