From 9966b873a5d07f5a2c094245312a914ba2130c9d Mon Sep 17 00:00:00 2001 From: oliver Date: Fri, 17 Nov 2023 14:49:33 +0100 Subject: [PATCH 1/3] update dune-project and documentation --- docs/developer-guide/debugging.md | 5 +++-- dune-project | 4 +++- goblint.opam.locked | 12 ++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/developer-guide/debugging.md b/docs/developer-guide/debugging.md index 7875a9b01e..5c1db12227 100644 --- a/docs/developer-guide/debugging.md +++ b/docs/developer-guide/debugging.md @@ -85,7 +85,7 @@ The configuration file has to be named `launch.json` and must reside in the `./. "configurations": [ { "name": "Goblint", - "type": "ocamlearlybird", + "type": "ocaml.earlybird", "request": "launch", "program": "${workspaceFolder}/goblint.byte", "arguments": [ @@ -97,7 +97,8 @@ The configuration file has to be named `launch.json` and must reside in the `./. ] } ``` -Note that the individual arguments to Goblint should be passed here as separate strings that do not contain spaces. +Note that the individual arguments to Goblint should be passed here as separate strings that do not contain spaces. Finally, to enable breakpoints uncomment `(map_workspace_root false)` in the dune-project file. + ### Running Goblint in the VS Code Debugger diff --git a/dune-project b/dune-project index 4a9cd8e3c1..05c7d9418c 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.6) +(lang dune 3.7) (using dune_site 0.1) (cram enable) (name goblint) @@ -64,3 +64,5 @@ (share lib) (share conf)) ) + +; (map_workspace_root false) ;uncomment to enable breakpoints diff --git a/goblint.opam.locked b/goblint.opam.locked index 2744d2fe92..0abe989955 100644 --- a/goblint.opam.locked +++ b/goblint.opam.locked @@ -50,12 +50,12 @@ depends: [ "cpu" {= "2.0.0"} "csexp" {= "1.5.1"} "ctypes" {= "0.20.1"} - "dune" {= "3.6.1"} - "dune-build-info" {= "3.6.1"} - "dune-configurator" {= "3.6.1"} - "dune-private-libs" {= "3.6.1"} - "dune-site" {= "3.6.1"} - "dyn" {= "3.6.1"} + "dune" {= "3.7.1"} + "dune-build-info" {= "3.7.1"} + "dune-configurator" {= "3.7.1"} + "dune-private-libs" {= "3.7.1"} + "dune-site" {= "3.7.1"} + "dyn" {= "3.7.1"} "fileutils" {= "0.6.4"} "fmt" {= "0.9.0"} "fpath" {= "0.7.3"} From 85e6fdbfcba3d42bf35b44f1c41171e958890451 Mon Sep 17 00:00:00 2001 From: oliver Date: Mon, 20 Nov 2023 01:55:30 +0100 Subject: [PATCH 2/3] bump dune dependencies and rebuild goblint.opam --- goblint.opam | 2 +- goblint.opam.locked | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/goblint.opam b/goblint.opam index bf51924626..34912fde26 100644 --- a/goblint.opam +++ b/goblint.opam @@ -19,7 +19,7 @@ homepage: "https://goblint.in.tum.de" doc: "https://goblint.readthedocs.io/en/latest/" bug-reports: "https://github.com/goblint/analyzer/issues" depends: [ - "dune" {>= "3.6"} + "dune" {>= "3.7"} "ocaml" {>= "4.10"} "goblint-cil" {>= "2.0.2"} "batteries" {>= "3.5.0"} diff --git a/goblint.opam.locked b/goblint.opam.locked index 0abe989955..6e15ac8900 100644 --- a/goblint.opam.locked +++ b/goblint.opam.locked @@ -76,7 +76,7 @@ depends: [ "ocamlfind" {= "1.9.5"} "odoc" {= "2.2.0" & with-doc} "odoc-parser" {= "2.0.0" & with-doc} - "ordering" {= "3.6.1"} + "ordering" {= "3.7.1"} "ounit2" {= "2.2.6" & with-test} "pp" {= "1.1.2"} "ppx_derivers" {= "1.2.1"} @@ -93,7 +93,7 @@ depends: [ "sexplib0" {= "v0.15.1"} "sha" {= "1.15.2"} "stdlib-shims" {= "0.3.0"} - "stdune" {= "3.6.1"} + "stdune" {= "3.7.1"} "stringext" {= "1.6.0"} "topkg" {= "1.0.6"} "tyxml" {= "4.5.0" & with-doc} From 5784ffeb5f0e26b4da059a0d762480a0ce999505 Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Mon, 20 Nov 2023 14:44:56 +0200 Subject: [PATCH 3/3] Update Gobview submodule for dune 3.7.1 lock --- gobview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gobview b/gobview index 42b07f8253..b4467d820f 160000 --- a/gobview +++ b/gobview @@ -1 +1 @@ -Subproject commit 42b07f825316052ec030370daf0d00ebe28ec092 +Subproject commit b4467d820f28bac578fc0baf7f81393c67f6b82b