diff --git a/dune-project b/dune-project index 7c1c263..9f5a670 100644 --- a/dune-project +++ b/dune-project @@ -25,6 +25,7 @@ (depends dune (ocaml (>= 4.10.0)) + (js_of_ocaml (>= 4.1.0)) batteries cohttp-lwt cohttp-lwt-unix diff --git a/gobview.opam b/gobview.opam index 04e81ac..72c0ac8 100644 --- a/gobview.opam +++ b/gobview.opam @@ -14,6 +14,7 @@ bug-reports: "https://github.com/goblint/gobview/issues" depends: [ "dune" {>= "2.7"} "ocaml" {>= "4.10.0"} + "js_of_ocaml" {>= "4.1.0"} "batteries" "cohttp-lwt" "cohttp-lwt-unix" @@ -49,6 +50,6 @@ build: [ ] dev-repo: "git+https://github.com/goblint/gobview.git" pin-depends: [ - [ "jsoo-react.dev" "git+https://github.com/sim642/jsoo-react.git#bc9cc4c00761c6c9d09101cddca437731de96eae" ] + [ "jsoo-react.dev" "git+https://github.com/sim642/jsoo-react.git#57c4bde195ea572070c3c38ee7f44aa01767b936" ] [ "zarith.1.12-gob0" "git+https://github.com/goblint/Zarith.git#goblint-release-1.12" ] ] diff --git a/gobview.opam.locked b/gobview.opam.locked index 8a65907..217e823 100644 --- a/gobview.opam.locked +++ b/gobview.opam.locked @@ -19,6 +19,8 @@ depends: [ "base" {= "v0.15.1"} "base-bigarray" {= "base"} "base-bytes" {= "base"} + "base-domains" {= "base"} + "base-nnp" {= "base"} "base-threads" {= "base"} "base-unix" {= "base"} "base64" {= "3.5.0"} @@ -38,7 +40,6 @@ depends: [ "conf-gcc" {= "1.0"} "conf-gmp" {= "4"} "conf-gmp-powm-sec" {= "3"} - "conf-libssl" {= "4"} "conf-perl" {= "2"} "conf-pkg-config" {= "2"} "cppo" {= "1.6.9"} @@ -72,9 +73,7 @@ depends: [ "jsoo-react" {= "dev"} "logs" {= "0.7.0"} "lwt" {= "5.6.1"} - "lwt_log" {= "1.1.2"} "lwt_ppx" {= "2.1.0"} - "lwt_ssl" {= "1.1.3"} "macaddr" {= "5.3.1"} "magic-mime" {= "1.3.0"} "menhir" {= "20220210"} @@ -86,12 +85,12 @@ depends: [ "mirage-crypto-pk" {= "0.11.1"} "mirage-crypto-rng" {= "0.11.1"} "num" {= "1.4"} - "ocaml" {= "4.14.0"} + "ocaml" {= "5.0.0"} "ocaml-compiler-libs" {= "v0.12.4"} - "ocaml-config" {= "2"} + "ocaml-config" {= "3"} "ocaml-option-flambda" {= "1"} "ocaml-syntax-shims" {= "1.0.0"} - "ocaml-variants" {= "4.14.0+options"} + "ocaml-variants" {= "5.0.0+options"} "ocaml-version" {= "3.5.0"} "ocamlbuild" {= "0.14.2"} "ocamlfind" {= "1.9.5"} @@ -121,7 +120,6 @@ depends: [ "seq" {= "base"} "sexplib" {= "v0.15.1"} "sexplib0" {= "v0.15.1"} - "ssl" {= "0.5.13"} "stdio" {= "v0.15.0"} "stdlib-shims" {= "0.3.0"} "stringext" {= "1.6.0"} @@ -156,7 +154,7 @@ dev-repo: "git+https://github.com/goblint/gobview.git" pin-depends: [ [ "jsoo-react.dev" - "git+https://github.com/sim642/jsoo-react.git#bc9cc4c00761c6c9d09101cddca437731de96eae" + "git+https://github.com/sim642/jsoo-react.git#57c4bde195ea572070c3c38ee7f44aa01767b936" ] [ "zarith.1.12-gob0" diff --git a/gobview.opam.template b/gobview.opam.template index 402a632..fd30833 100644 --- a/gobview.opam.template +++ b/gobview.opam.template @@ -1,4 +1,4 @@ pin-depends: [ - [ "jsoo-react.dev" "git+https://github.com/sim642/jsoo-react.git#bc9cc4c00761c6c9d09101cddca437731de96eae" ] + [ "jsoo-react.dev" "git+https://github.com/sim642/jsoo-react.git#57c4bde195ea572070c3c38ee7f44aa01767b936" ] [ "zarith.1.12-gob0" "git+https://github.com/goblint/Zarith.git#goblint-release-1.12" ] ] diff --git a/runtime/stubs.js b/runtime/stubs.js index 2f5fd04..19d55af 100644 --- a/runtime/stubs.js +++ b/runtime/stubs.js @@ -1,19 +1,23 @@ -//Provides: unix_getpid -function unix_getpid() { +//Provides: caml_unix_getpid +//Alias: unix_getuid +function caml_unix_getpid() { return 0; } -//Provides: unix_kill -function unix_kill(pid, signal) { } +//Provides: caml_unix_kill +//Alias: unix_kill +function caml_unix_kill(pid, signal) { } -//Provides: unix_setitimer -function unix_setitimer(which, newval) { +//Provides: caml_unix_setitimer +//Alias: unix_setitimer +function caml_unix_setitimer(which, newval) { return newval; } -//Provides: unix_times +//Provides: caml_unix_times +//Alias: unix_times //only used for timing statistics in Goblint -function unix_times(x) { +function caml_unix_times(x) { return 0; }