From 984fa24ca6d1ad476d3a170969b4933591424d1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Mon, 25 Mar 2019 17:12:52 +0100 Subject: [PATCH] Installation seems to work using README_INSTALL --- src/ligo/README_INSTALL | 9 ++++++++- src/ligo/ligo-parser/Version.ml | 1 - src/ligo/ligo-parser/dune | 7 +++---- src/ligo/ligo.opam | 1 + src/ligo/rope_test.ml | 1 - 5 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 src/ligo/ligo-parser/Version.ml diff --git a/src/ligo/README_INSTALL b/src/ligo/README_INSTALL index ae7f25a0a..8d82d4bb5 100644 --- a/src/ligo/README_INSTALL +++ b/src/ligo/README_INSTALL @@ -2,9 +2,16 @@ sudo apt install libev-dev libhidapi-dev opam init opam switch create toto ocaml-base-compiler.4.06.1 opam repository add new-tezos https://gitlab.com/gabriel.alfour/new-tezos-opam-repository.git + # si une build a déjà été tentée, il vaut mieux git add tout ce qui est utile et git clean -dfx pour supprimer tout le reste (dune 1.7 crée des fichiers non compatibles avec dune 1.6) -cd src/lib_utils && opam install . +opam install ocplib-endian + +rm src/ligo/ligo-parser/AST2.ml src/ligo/ligo-parser/Typecheck2.ml src/ligo/ligo-parser/Typecheck2.mli +git checkout ligo-parser/ligo_parser.ml +sed -i -e '4,5d; s/ |>.*//' ligo-parser/ligo_parser.ml + cd src/ligo/ligo-parser && opam install . +cd src/ligo/ligo-helpers && opam install . cd src/ligo && opam install . opam install merlin opam user-setup install diff --git a/src/ligo/ligo-parser/Version.ml b/src/ligo/ligo-parser/Version.ml deleted file mode 100644 index 8e562012c..000000000 --- a/src/ligo/ligo-parser/Version.ml +++ /dev/null @@ -1 +0,0 @@ -let version = "84dbf1f7eee30a9d3f8a8363efa5b6f04e7c2f36" diff --git a/src/ligo/ligo-parser/dune b/src/ligo/ligo-parser/dune index 9b963bf3c..29154a231 100644 --- a/src/ligo/ligo-parser/dune +++ b/src/ligo/ligo-parser/dune @@ -6,10 +6,9 @@ (modules ParToken Parser) (flags -la 1 --explain --external-tokens LexToken)) -(executables - (names LexerMain ParserMain) - (public_names ligo-lexer ligo-parser) - (package ligo-parser) +(library + (name ligo_parser) + (public_name ligo-parser) (modules_without_implementation Error) (libraries getopt hex str uutf zarith)) diff --git a/src/ligo/ligo.opam b/src/ligo/ligo.opam index c2f5664c1..5cc61a43c 100644 --- a/src/ligo/ligo.opam +++ b/src/ligo/ligo.opam @@ -14,6 +14,7 @@ depends: [ "tezos-utils" "meta-michelson" "ligo-helpers" + "ligo-parser" ] build: [ [ "dune" "build" "-p" name "-j" jobs ] diff --git a/src/ligo/rope_test.ml b/src/ligo/rope_test.ml index 238ab61dd..07dfc3e21 100644 --- a/src/ligo/rope_test.ml +++ b/src/ligo/rope_test.ml @@ -1,5 +1,4 @@ module A = struct - open Rope_top_level_open open Rope let _ = d