Merge pull request #1 from savonet/dune

Convert to dune!
savonet · Mar 8, 2021 · 9db7f0e · 9db7f0e
2 parents 4244add + d7c18fc
commit 9db7f0e
Show file tree

Hide file tree

Showing 37 changed files with 808 additions and 4,094 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,17 @@
+name: Build
+on: [push]
+jobs:
+  build:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest, macos-latest]
+        ocaml-version: ['4.09.0']
+    steps:
+    - uses: actions/checkout@v1
+    - uses: avsm/setup-ocaml@master
+      with:
+        ocaml-version: ${{ matrix.ocaml-version }}
+    - run: opam pin add -n .
+    - run: opam depext -yt theora
+    - run: opam install -t .
diff --git a/.gitignore b/.gitignore
@@ -1,19 +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
-.*sw*
+*~
+_build
+*.byte
+*.native
+_tests
+.merlin
+*.install
diff --git a/.gitmodules b/.gitmodules
diff --git a/.ocamlformat b/.ocamlformat
@@ -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
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.4.0 (08-03-2021)
+======
+* Switch to dune
+
 0.3.1 (03-08-2015)
 =====
 * Changed types to match new ocaml-ogg's API.

diff --git a/Makefile.in b/Makefile.in
diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -0,0 +1,41 @@
+ocaml-theora
+============
+
+This package contains an OCaml interface for the `theora` library
+
+Please read the COPYING file before using this software.
+
+Prerequisites:
+==============
+
+- ocaml
+- libtheora
+- findlib
+- ocaml-ogg >= 0.7.0
+- dune >= 2.0
+
+Compilation:
+============
+
+```
+$ dune build
+```
+
+This should build both the native and the byte-code version of the
+extension library.
+
+Installation:
+=============
+
+Via `opam`:
+
+```
+$ opam install theora
+```
+
+Via `dune` (for developers):
+```
+$ dune install
+```
+
+This should install the library file in the appropriate place.
diff --git a/bootstrap b/bootstrap
diff --git a/configure.ac b/configure.ac
diff --git a/dune-project b/dune-project
@@ -0,0 +1,20 @@
+(lang dune 2.0)
+(version 0.4.0)
+(name theora)
+(source (github savonet/ocaml-theora))
+(license GPL-2.0)
+(authors "The Savonet Team <[email protected]>")
+(maintainers "The Savonet Team <[email protected]>")
+
+(generate_opam_files true)
+
+(package
+ (name theora)
+ (synopsis "Bindings to libtheora")
+ (depends
+  conf-libtheora
+  conf-pkg-config
+  (dune (>= 2.0))
+  dune-configurator
+  (ogg (>= 0.7.0)))
+)
diff --git a/examples/Makefile b/examples/Makefile
diff --git a/examples/Makefile.thtranscode b/examples/Makefile.thtranscode