Skip to content

Commit

Permalink
[build] Migrate to dune / ocaml-migrate-parsetree
Browse files Browse the repository at this point in the history
Fixes ocaml-ppx#26. Changes:

- Build system migrated to Dune.
- Remove use of `cppo` in favor of ocaml-migrate-parsetree
- Remove use of `topkg` in favor of `dune-release`
- Updated `.gitignore`

This is still work in progress, in particular, it only works with
OCaml 4.06 due to the need to have `typedtree` versioning. This will
need to be resolved before this PR can be merged.

Another question is whether we should use `ppx_tools_versioned` or
`ppxlib` directly.
  • Loading branch information
ejgallego committed Sep 4, 2018
1 parent 74f0d5b commit a06c78b
Show file tree
Hide file tree
Showing 18 changed files with 92 additions and 613 deletions.
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
*.native
*.byte
*.docdir
*~
_build
*.install
pkg/META
.merlin
6 changes: 6 additions & 0 deletions CHANGELOG.md → CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

1.5
---

* ocaml-migrate-parsetree + dune support #26
(Jérémie Dimino & Emilio Jesús Gallego Arias)

1.4
---

Expand Down
File renamed without changes.
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
build:
cp pkg/META.in pkg/META
ocaml pkg/build.ml native=true native-dynlink=true

test: build
rm -rf _build/src_test
ocamlbuild -j 0 -use-ocamlfind -classic-display src_test/test_ppx_import.native --
dune build

clean:
ocamlbuild -clean
dune clean

.PHONY: build test clean

Expand Down
4 changes: 0 additions & 4 deletions _tags

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.1)

5 changes: 5 additions & 0 deletions dune-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(lang dune 1.1)

(env
(dev (flags :standard))
(release (flags :standard)))
9 changes: 0 additions & 9 deletions myocamlbuild.ml

This file was deleted.

30 changes: 0 additions & 30 deletions opam

This file was deleted.

3 changes: 0 additions & 3 deletions pkg/META.in

This file was deleted.

14 changes: 0 additions & 14 deletions pkg/build.ml

This file was deleted.

Loading

0 comments on commit a06c78b

Please sign in to comment.