Skip to content

Commit

Permalink
New order (#703)
Browse files Browse the repository at this point in the history
* Updates for Functoria
- package type
- instead of lists of packages and libraries, use lists of packages
- Cmd and Log got replaced with Bos and Logs
- re-add build subcommand
- don't generate a complex Makefile, instead call out to ocamlbuild and pkg-config manually

* remove main.native.*

* target -> get_target

* guard myocamlbuild add/remove

* style and opam build rule

* use pp instead of to_string

* use "-X _build-ukvm"

* pass ukvm modules explicitly
  • Loading branch information
hannesm authored and mato committed Nov 29, 2016
1 parent 53d38dc commit 85b6932
Show file tree
Hide file tree
Showing 8 changed files with 621 additions and 639 deletions.
2 changes: 1 addition & 1 deletion .merlin
Expand Up @@ -3,7 +3,7 @@ S lib/*
S lib_runtime/*
S lib_test/*
PKG ipaddr unix dynlink lwt cmdliner mirage-types.lwt functoria rresult fmt
PKG astring logs
PKG astring logs bos mirage-runtime

FLG -w +A-4-6-7-9-40-42-44-48
FLG -strict_sequence -safe_string
2 changes: 1 addition & 1 deletion _tags
Expand Up @@ -5,7 +5,7 @@ true: debug, annot, bin_annot
# Better locations and loc in .mlis
true: keep_locs

<lib/*>: package(ipaddr logs astring functoria functoria.app mirage-runtime)
<lib/*>: package(ipaddr logs astring functoria functoria.app mirage-runtime bos)

# Force the runtime to be unix-independent.
<lib_runtime/*>: package(functoria-runtime ipaddr astring logs mirage-types)
Expand Down

0 comments on commit 85b6932

Please sign in to comment.