Use opam with-dev-setup

dune-project

@@ -70,6 +70,8 @@ Goblint includes analyses for assertions, overflows, deadlocks, etc and can be e
     conf-gcc ; ensures opam-repository CI installs real gcc from homebrew on MacOS
     domain-local-await
     domain_shims
+    (ocaml-lsp-server :with-dev-setup) ; needed for https://github.com/ocamllabs/vscode-ocaml-platform
+    (ocp-indent :with-dev-setup) ; needed for pre-commit hook
   )
   (depopts
     apron

goblint.opam

@@ -72,6 +72,8 @@ depends: [
   "conf-gcc"
   "domain-local-await"
   "domain_shims"
+  "ocaml-lsp-server" {with-dev-setup}
+  "ocp-indent" {with-dev-setup}
 ]
 depopts: ["apron" "z3" "domainslib" "memtrace"]
 conflicts: [

make.sh

@@ -81,11 +81,8 @@ rule() {
       opam_setup
     ;; dev)
       eval $(opam env)
-      echo "Installing opam packages for test and doc..."
-      opam install -y . --deps-only --locked --with-test --with-doc
-      echo "Installing opam packages for development..."
-      opam install -y ocaml-lsp-server ocp-indent
-      # ocaml-lsp-server is needed for https://github.com/ocamllabs/vscode-ocaml-platform
+      echo "Installing opam packages for test, doc and dev-setup..."
+      opam install -y . --deps-only --locked --with-test --with-doc --with-dev-setup
       echo "Installing Pre-commit hook..."
       cd .git/hooks; ln -sf ../../scripts/hooks/pre-commit; cd -
       # Use `git commit -n` to temporarily bypass the hook if necessary.