add more dune deps + use public_names
This commit is contained in:
parent
8bb9d35dda
commit
9fd3b5a3cc
6 changed files with 73 additions and 58 deletions
40
GNUmakefile
40
GNUmakefile
|
|
@ -10,27 +10,25 @@ tap_device=tap0
|
|||
check-kvm:
|
||||
$(if $(wildcard /dev/kvm),,$(error KVM support not enabled))
|
||||
|
||||
# todo: just opam install . --deps-only?
|
||||
pins:
|
||||
#opam pin --no-action --yes "git+https://github.com/robur-coop/mcrunch.git#682ed63c03e3be5664f96c469a260e1d9e9df011"
|
||||
opam pin --no-action --yes "git+https://github.com/mirage/Zarith.git#zarith-1.14"
|
||||
opam pin --no-action --yes "git+https://github.com/robur-coop/vif.git#8c6ac3fb97cb9a31bf6ad8ec63c942336dcfd03e"
|
||||
opam pin --no-action --yes "git+https://github.com/robur-coop/mfat.git#5b1204d914e853f0139c6d2776511f530b753550"
|
||||
opam pin --no-action --yes "git+https://github.com/swrup/mirage-mtime.git#6a6bb4dd25624a3c43e6417dcdf73f3c689946a7"
|
||||
opam pin --no-action --yes add caqti "git+https://github.com/swrup/ocaml-caqti.git#186650581efd9d247ced982cdefd74256905e3b0"
|
||||
opam pin --no-action --yes add caqti-miou "git+https://github.com/swrup/ocaml-caqti.git#186650581efd9d247ced982cdefd74256905e3b0"
|
||||
opam pin --no-action --yes add caqti-mnet "git+https://github.com/swrup/ocaml-caqti.git#186650581efd9d247ced982cdefd74256905e3b0"
|
||||
opam pin --no-action --yes add caqti-driver-pgx "git+https://github.com/swrup/ocaml-caqti.git#186650581efd9d247ced982cdefd74256905e3b0"
|
||||
|
||||
installs:
|
||||
opam install --yes dune utop merlin ocp-browser ocamlformat
|
||||
# opam install --yes mcrunch
|
||||
opam install --yes dune utop merlin ocp-browser ocamlformat
|
||||
opam install --yes crunch
|
||||
opam install --yes sqlite3 # needed for caqti even if not used
|
||||
opam install --yes caqti-driver-pgx
|
||||
opam install --yes $(vendor_list)
|
||||
|
||||
pins:
|
||||
opam pin --no-action --yes "git+https://github.com/robur-coop/mcrunch.git#682ed63c03e3be5664f96c469a260e1d9e9df011"
|
||||
opam pin --no-action --yes "git+https://github.com/mirage/Zarith.git#zarith-1.14"
|
||||
opam pin --no-action --yes "git+https://github.com/swrup/mirage-mtime.git#6a6bb4dd25624a3c43e6417dcdf73f3c689946a7"
|
||||
opam pin --no-action --yes "git+https://github.com/robur-coop/vif.git#8c6ac3fb97cb9a31bf6ad8ec63c942336dcfd03e"
|
||||
opam pin --no-action --yes add caqti "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
|
||||
opam pin --no-action --yes add caqti-miou "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
|
||||
opam pin --no-action --yes add caqti-mnet "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
|
||||
opam pin --no-action --yes add caqti-driver-pgx "git+https://github.com/swrup/ocaml-caqti.git#7838c29ffa9095d32b95affee26b22ef2ad302fd"
|
||||
opam pin --no-action --yes "git+https://github.com/robur-coop/mfat.git#5b1204d914e853f0139c6d2776511f530b753550"
|
||||
|
||||
|
||||
.PHONY: vendors
|
||||
vendors:
|
||||
@mkdir -p vendors
|
||||
|
|
@ -43,19 +41,19 @@ clean:
|
|||
rm -rf _build/
|
||||
rm -rf vendors/
|
||||
|
||||
# todo: don't erase already existing
|
||||
assets:
|
||||
@cp default/assets ./
|
||||
|
||||
secmod.fat:
|
||||
@mkdir -p assets
|
||||
mfat make --sectors=2048 $(secmod_fat)
|
||||
|
||||
assets:
|
||||
cp default/assets ./
|
||||
|
||||
manifest:
|
||||
dune exec src/mte.exe > src/manifest.json
|
||||
@dune exec src/mte.exe > src/manifest.json
|
||||
|
||||
build:
|
||||
dune build --workspace dune-workspace.solo5 src/mte.exe
|
||||
@dune build @all
|
||||
@dune build --workspace dune-workspace.solo5 src/mte.exe
|
||||
|
||||
run: build
|
||||
solo5-hvt --block:storage=$(secmod_fat) --net:service=$(tap_device) -- ./_build/solo5/src/mte.exe --solo5:quiet
|
||||
@solo5-hvt --block:storage=$(secmod_fat) --net:service=$(tap_device) -- ./_build/solo5/src/mte.exe
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue