Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to OCaml 5.0 #26

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgrade to OCaml 5.0 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
627e256
Upgrade to OCaml 5.0
sim642 Aug 16, 2023
d28c8ef
Fix OCaml 5 stubs naming
sim642 Sep 11, 2023
415ee59
Add js_of_ocaml lower bound for stub aliases
sim642 Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
(depends
dune
(ocaml (>= 4.10.0))
(js_of_ocaml (>= 4.1.0))
batteries
cohttp-lwt
cohttp-lwt-unix
Expand Down
3 changes: 2 additions & 1 deletion gobview.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" ]
]
14 changes: 6 additions & 8 deletions gobview.opam.locked
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -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"}
Expand Down Expand Up @@ -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"}
Expand All @@ -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"}
Expand Down Expand Up @@ -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"}
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gobview.opam.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" ]
]
20 changes: 12 additions & 8 deletions runtime/stubs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down