Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port build system to dune #39

Merged
merged 4 commits into from
Aug 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
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
*.install
.merlin
_build
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ addons:
before_install:
- export OPAMYES=1
- opam init
- opam install -q -y ocamlfind base-bytes
- opam install -q -y dune
- eval `opam config env`

script: ./bootstrap && ./configure && make && cd examples && ./configure --with-ssl-dir=../src && make
script: dune build @default @runtest
19 changes: 19 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.PHONY: build clean test install uninstall clean all-supported-ocaml-versions

build:
dune build @default

test:
dune runtest

install:
dune install

uninstall:
dune uninstall

clean:
dune clean

all-supported-ocaml-versions:
dune build @default @runtest --workspace dune-workspace.dev
39 changes: 0 additions & 39 deletions Makefile.in

This file was deleted.

1 change: 0 additions & 1 deletion bootstrap

This file was deleted.

33 changes: 0 additions & 33 deletions configure.ac

This file was deleted.

2 changes: 2 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(lang dune 1.0)
(name ssl)
9 changes: 9 additions & 0 deletions dune-workspace.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
(lang dune 1.0)

;; This file is used by `make all-supported-ocaml-versions`
(context (opam (switch 4.02.3)))
(context (opam (switch 4.03.0)))
(context (opam (switch 4.04.2)))
(context (opam (switch 4.05.0)))
(context (opam (switch 4.06.1)))
(context (opam (switch 4.07.0)))
17 changes: 0 additions & 17 deletions examples/Makefile

This file was deleted.

7 changes: 0 additions & 7 deletions examples/Makefile.stalkd.in

This file was deleted.

7 changes: 0 additions & 7 deletions examples/Makefile.stelnet.in

This file was deleted.

Loading