Merge branch 'master' of gitlab.com:gabriel.alfour/tezos

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 before_script:
   - apt-get update -qq
-  - apt-get -y -qq install libhidapi-dev libcap-dev libev-dev bubblewrap
+  # rsync is needed by opam to sync a package installed from a local directory with the copy in ~/.opam
+  - apt-get -y -qq install rsync libhidapi-dev libcap-dev libev-dev bubblewrap
   - wget https://github.com/ocaml/opam/releases/download/2.0.1/opam-2.0.1-x86_64-linux -O opam-2.0.1-x86_64-linux
   - cp opam-2.0.1-x86_64-linux /usr/local/bin/opam
   - chmod +x /usr/local/bin/opam
@@ -19,9 +20,9 @@ before_script:
 
 default-job:
   script:
-    - (cd src/lib_utils && ls -a && opam install -y --working-dir .)
-    - (cd src/ligo      && ls -a && opam install -y --working-dir .)
-    - (cd src/ligo      && ls -a && dune build && dune build -p ligo && dune build @ligo-test)
+    - (cd src/lib_utils && opam install -y --build-test --working-dir .)
+    - (cd src/ligo      && opam install -y --build-test --working-dir .)
+    - (cd src/ligo      && dune build && dune build -p ligo && dune build @ligo-test)
   artifacts:
     paths:
       - src/ligo/bin/cli.ml
@@ -30,3 +31,8 @@ default-job:
 install-from-repo-job:
   script:
     - opam install -y ligo
+    # Used in the IDE
+    #- opam install -y user-setup
+    #- opam install -y merlin
+    #- opam install -y ocp-indent
+    #- opam user-setup install

src/ligo/ligo.opam

@@ -1,3 +1,4 @@
+name: "ligo"
 opam-version: "2.0"
 version: "1.0"
 maintainer: "gabriel.alfour@gmail.com"
@@ -13,11 +14,12 @@ depends: [
   "menhir"
   "ppx_let"
   "tezos-utils"
-  "getopt"
   "yojson"
+  "alcotest" { with-test }
 ]
 build: [
   [ "dune" "build" "-p" name "-j" jobs ]
+  # needed in the repository, but must not be present in the local ligo.opam [ "mv" "src/ligo/ligo.install" "." ]
 ]
 
 url {

src/ligo/parser/pascaligo/dune

@@ -9,9 +9,9 @@
 (library
  (name parser_pascaligo)
  (public_name ligo.parser.pascaligo)
+ (modules AST FQueue Markup pascaligo Utils Version Lexer Error Parser ParserLog LexToken)
  (modules_without_implementation Error)
  (libraries
-   getopt
    hex
    str
    uutf
@@ -23,17 +23,17 @@
 ;; Les deux directives (rule) qui suivent sont pour le dev local.
 ;; Il suffit de faire "dune build Parser.exe" pour avoir un Parser.exe dans le dossier.
 ;; Pour le purger, il faut faire "dune clean".
-(rule
-  (targets Parser.exe)
-  (deps ParserMain.exe)
-  (action (copy ParserMain.exe Parser.exe))
-  (mode promote-until-clean))
+;(rule
+;  (targets Parser.exe)
+;  (deps ParserMain.exe)
+;  (action (copy ParserMain.exe Parser.exe))
+;  (mode promote-until-clean))
 
-(rule
-  (targets Lexer.exe)
-  (deps LexerMain.exe)
-  (action (copy LexerMain.exe Lexer.exe))
-  (mode promote-until-clean))
+;(rule
+;  (targets Lexer.exe)
+;  (deps LexerMain.exe)
+;  (action (copy LexerMain.exe Lexer.exe))
+;  (mode promote-until-clean))
 
 (rule
   (targets Version.ml)