Skip to content

Commit

Permalink
Switch to dune! (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
toots authored Jan 2, 2021
1 parent 7541ad2 commit c4c10d0
Show file tree
Hide file tree
Showing 30 changed files with 1,171 additions and 3,347 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Build
on: [push]
jobs:
build:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v1
- uses: avsm/setup-ocaml@master
- run: opam pin add -n .
- run: opam depext -yt bjack
- run: opam install -t .
25 changes: 7 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
Makefile
aclocal.m4
autom4te.cache/
config.guess
config.log
config.status
config.sub
configure
install-sh
src/META
src/Makefile
src/._bcdi/
src/._d/
src/._ncdi/
src/*.a
src/*.cm*
src/*.o
src/*.so
*~
_build
*.byte
*.native
_tests
.merlin
*.install
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

9 changes: 9 additions & 0 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
profile = conventional
break-separators = after
space-around-lists = false
doc-comments = before
match-indent = 2
match-indent-nested = always
parens-ite
exp-grouping = preserve
module-item-spacing = compact
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
0.1.6 (unreleased)
======
* Switch to dune!

0.1.5 (2015-07-29)
=====
* Fix some warnings and deprecated calls.
Expand Down
30 changes: 0 additions & 30 deletions Makefile.in

This file was deleted.

24 changes: 15 additions & 9 deletions README → README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,35 @@ Please read the COPYING file before using this software.
Prerequisites:
==============

- ocaml >= 3.10.1 (haven't tried earlier versions)
- ocaml

- jack audio connection kit >= 0.109.2 (haven't tried earlier versions)
- jack audio connection kit

- samplerate >= 0.1.3 (haven't tried earlier versions)

- findlib >= 0.8.1 (haven't tried earlier versions)
- dune >= 2.0

Compilation:
============

$ make all
```
$ dune build
```

This should build both the native and the byte-code version of the
extension library.

Installation:
=============

$ make install
Via `opam`:

```
$ opam install mad
```

This should install the library file (using ocamlfind) in the
appropriate place.
Via `dune` (for developers):
```
$ dune install
```

Author:
=======
Expand Down
47 changes: 24 additions & 23 deletions bjack.opam
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
name: "bjack"
version: "0.1.5"
maintainer: "Romain Beauxis <toots@rastageeks.org>"
authors: "The Savonet Team <savonet-users@lists.sourceforge.net>"
version: "0.1.6"
synopsis:
"Bindings for the Jack library which provides functions for linking audio programs"
maintainer: ["The Savonet Team <savonet-users@lists.sourceforge.net>"]
authors: ["The Savonet Team <savonet-users@lists.sourceforge.net>"]
license: "LGPL-2.1"
homepage: "https://github.com/savonet/ocaml-bjack"
build: [
["./bootstrap"] {dev}
["./configure" "--prefix" prefix]
[make "clean"] {dev}
[make]
]
install: [
[make "install"]
]
bug-reports: "https://github.com/savonet/ocaml-bjack/issues"
depends: [
"ocaml"
"ocamlfind" {build}
"dune" {>= "2.0"}
"dune-configurator"
"conf-bjack"
]
depexts: [
["jack-dev"] {os-distribution = "alpine"}
["libjack-dev" "libsamplerate0-dev"] {os-distribution = "debian"}
["libjack-dev" "libsamplerate0-dev"] {os-distribution = "ubuntu"}
["jack"] {os = "macos" & os-distribution = "homebrew"}
build: [
["dune" "subst"] {pinned}
[
"dune"
"build"
"-p"
name
"-j"
jobs
"@install"
"@runtest" {with-test}
"@doc" {with-doc}
]
]
bug-reports: "https://github.com/savonet/ocaml-bjack/issues"
dev-repo: "git+https://github.com/savonet/ocaml-bjack.git"
synopsis:
"Bindings for the Jack library which provides functions for linking audio programs"
1 change: 0 additions & 1 deletion bootstrap

This file was deleted.

22 changes: 0 additions & 22 deletions configure.ac

This file was deleted.

18 changes: 18 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
(lang dune 2.0)
(version 0.1.6)
(name bjack)
(source (github savonet/ocaml-bjack))
(license LGPL-2.1)
(authors "The Savonet Team <savonet-users@lists.sourceforge.net>")
(maintainers "The Savonet Team <savonet-users@lists.sourceforge.net>")

(generate_opam_files true)

(package
(name bjack)
(synopsis "Bindings for the Jack library which provides functions for linking audio programs")
(depends
(dune (>= 2.0))
dune-configurator
conf-bjack)
)
Loading

0 comments on commit c4c10d0

Please sign in to comment.