From e157e0527b0e1b117e2392685d0708de7492152c Mon Sep 17 00:00:00 2001 From: John David Pressman Date: Fri, 7 Jun 2019 22:16:55 -0700 Subject: [PATCH] Change makefile to use preexisting setup scripts for docker and add new ones --- makefile | 15 ++++++++++++--- scripts/build_ligo_local.sh | 2 ++ scripts/setup_dev_switch.sh | 4 ++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 scripts/build_ligo_local.sh create mode 100644 scripts/setup_dev_switch.sh diff --git a/makefile b/makefile index 44d6ec1fc..cceb4f50b 100644 --- a/makefile +++ b/makefile @@ -1,11 +1,20 @@ install: - ./install.sh +# Install opam and dependencies + scripts/install_build_environment.sh +# Install ligo/tezos specific system-level dependencies + scripts/install_native_dependencies.sh build-deps: - ./build-deps.sh +# Create opam dev switch locally for use with Ligo, add merlin/etc + scripts/create_dev_switch.sh +# Set up the local ligo opam repository so that it can be built + scripts/setup_ligo_opam_repository.sh +# Install OCaml build dependencies for Ligo + scripts/install_ligo_with_dependencies.sh build: build-deps - ./build.sh +# Build Ligo for local dev use + scripts/build_ligo_local.sh test: build eval $(opam env) diff --git a/scripts/build_ligo_local.sh b/scripts/build_ligo_local.sh new file mode 100644 index 000000000..85fcb6892 --- /dev/null +++ b/scripts/build_ligo_local.sh @@ -0,0 +1,2 @@ +eval $(opam env) +dune build -p ligo diff --git a/scripts/setup_dev_switch.sh b/scripts/setup_dev_switch.sh new file mode 100644 index 000000000..bf2c08293 --- /dev/null +++ b/scripts/setup_dev_switch.sh @@ -0,0 +1,4 @@ +opam switch create . ocaml-base-compiler.4.06.1 +eval $(opam env) +opam install -y ocp-indent merlin alcotest-lwt crowbar +opam -y user-setup install