From 4a05832da98df2e5f36e361ee5730887082057df Mon Sep 17 00:00:00 2001 From: Fabrice Le Fessant Date: Mon, 25 Sep 2023 17:19:13 +0200 Subject: [PATCH] Fixes to re-enable CI and cross-compilation --- .drom | 39 ++++----- Makefile.header | 6 ++ dune-project | 17 ++-- opam/cobol_ast.opam | 2 +- opam/cobol_common.opam | 2 +- opam/cobol_config.opam | 2 +- opam/cobol_data.opam | 2 +- opam/cobol_lsp.opam | 2 +- opam/cobol_parser.opam | 3 +- opam/cobol_typeck.opam | 2 +- opam/osx/cobol_ast-osx.opam | 15 ++-- opam/osx/cobol_common-osx.opam | 15 ++-- opam/osx/cobol_config-osx.opam | 18 +++-- opam/osx/cobol_data-osx.opam | 16 ++-- opam/osx/cobol_indent-osx.opam | 13 +-- opam/osx/cobol_lsp-osx.opam | 18 +++-- opam/osx/cobol_parser-osx.opam | 21 ++--- opam/osx/cobol_preproc-osx.opam | 14 ++-- opam/osx/cobol_typeck-osx.opam | 15 ++-- opam/osx/ebcdic_lib-osx.opam | 12 ++- opam/osx/interop-js-stubs.opam | 1 - opam/osx/node-js-stubs.opam | 1 - opam/osx/polka-js-stubs.opam | 1 - opam/osx/ppx_cobcflags-osx.opam | 13 +-- opam/osx/pretty-osx.opam | 14 ++-- opam/osx/superbol-free-osx.opam | 12 ++- opam/osx/superbol-vscode-extension.opam | 1 - opam/osx/superbol_free_lib-osx.opam | 14 ++-- opam/osx/superbol_testutils-osx.opam | 58 ++++++++++++++ opam/osx/vscode-debugadapter.opam | 1 - opam/osx/vscode-debugprotocol.opam | 1 - opam/osx/vscode-js-stubs.opam | 1 - opam/osx/vscode-json-osx.opam | 16 ++-- opam/osx/vscode-languageclient-js-stubs.opam | 1 - opam/osx/vscode-package-json-osx.opam | 17 ++-- opam/superbol_testutils.opam | 1 + opam/vscode-json.opam | 1 + opam/windows/cobol_ast-windows.opam | 15 ++-- opam/windows/cobol_common-windows.opam | 15 ++-- opam/windows/cobol_config-windows.opam | 18 +++-- opam/windows/cobol_data-windows.opam | 16 ++-- opam/windows/cobol_indent-windows.opam | 13 +-- opam/windows/cobol_lsp-windows.opam | 18 +++-- opam/windows/cobol_parser-windows.opam | 21 ++--- opam/windows/cobol_preproc-windows.opam | 14 ++-- opam/windows/cobol_typeck-windows.opam | 15 ++-- opam/windows/ebcdic_lib-windows.opam | 12 ++- opam/windows/interop-js-stubs.opam | 1 - opam/windows/node-js-stubs.opam | 1 - opam/windows/polka-js-stubs.opam | 1 - opam/windows/ppx_cobcflags-windows.opam | 13 +-- opam/windows/pretty-windows.opam | 14 ++-- opam/windows/superbol-free-windows.opam | 12 ++- opam/windows/superbol-vscode-extension.opam | 1 - opam/windows/superbol_free_lib-windows.opam | 14 ++-- opam/windows/superbol_testutils-windows.opam | 58 ++++++++++++++ opam/windows/vscode-debugadapter.opam | 1 - opam/windows/vscode-debugprotocol.opam | 1 - opam/windows/vscode-js-stubs.opam | 1 - opam/windows/vscode-json-windows.opam | 16 ++-- .../vscode-languageclient-js-stubs.opam | 1 - opam/windows/vscode-package-json-windows.opam | 17 ++-- src/lsp/cobol_ast/dune | 2 +- src/lsp/cobol_ast/package.toml | 3 +- src/lsp/cobol_common/dune | 2 +- src/lsp/cobol_common/package.toml | 3 +- src/lsp/cobol_config/dune | 2 +- src/lsp/cobol_config/package.toml | 3 +- src/lsp/cobol_data/dune | 2 +- src/lsp/cobol_data/package.toml | 5 +- src/lsp/cobol_lsp/dune | 2 +- src/lsp/cobol_lsp/package.toml | 3 +- src/lsp/cobol_parser/dune | 2 +- src/lsp/cobol_parser/package.toml | 4 +- src/lsp/cobol_typeck/dune | 2 +- src/lsp/cobol_typeck/package.toml | 3 +- src/testing/superbol_testutils/dune | 2 +- src/testing/superbol_testutils/package.toml | 2 +- src/vscode/vscode-json/dune | 2 +- .../vscode-json/linking_flags.sh.drom-tpl | 79 +++++++++++++++++++ src/vscode/vscode-json/package.toml | 1 + src/vscode/vscode-package-json/dune | 3 +- .../vscode-package-json/linking_flags.sh | 22 ++---- .../linking_flags.sh.drom-tpl | 79 +++++++++++++++++++ src/vscode/vscode-package-json/package.toml | 4 + 85 files changed, 637 insertions(+), 292 deletions(-) delete mode 120000 opam/osx/interop-js-stubs.opam delete mode 120000 opam/osx/node-js-stubs.opam delete mode 120000 opam/osx/polka-js-stubs.opam delete mode 120000 opam/osx/superbol-vscode-extension.opam create mode 100644 opam/osx/superbol_testutils-osx.opam delete mode 120000 opam/osx/vscode-debugadapter.opam delete mode 120000 opam/osx/vscode-debugprotocol.opam delete mode 120000 opam/osx/vscode-js-stubs.opam delete mode 120000 opam/osx/vscode-languageclient-js-stubs.opam delete mode 120000 opam/windows/interop-js-stubs.opam delete mode 120000 opam/windows/node-js-stubs.opam delete mode 120000 opam/windows/polka-js-stubs.opam delete mode 120000 opam/windows/superbol-vscode-extension.opam create mode 100644 opam/windows/superbol_testutils-windows.opam delete mode 120000 opam/windows/vscode-debugadapter.opam delete mode 120000 opam/windows/vscode-debugprotocol.opam delete mode 120000 opam/windows/vscode-js-stubs.opam delete mode 120000 opam/windows/vscode-languageclient-js-stubs.opam create mode 100644 src/vscode/vscode-json/linking_flags.sh.drom-tpl create mode 100644 src/vscode/vscode-package-json/linking_flags.sh.drom-tpl diff --git a/.drom b/.drom index c778460b3..3879d9edc 100644 --- a/.drom +++ b/.drom @@ -5,7 +5,7 @@ version:0.9.0 # hash of toml configuration files # used for generation of all files -6f7df8d2091bc13dc43421301fba391e:. +817e4b96072d8107ce0332774e85e0a5:. # end context for . # begin context for .github/workflows/workflow.yml @@ -80,27 +80,28 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css # begin context for dune-project # file dune-project -8fb34e9de0ffbbef84e1cf59c7cc253a:dune-project +0331551296e3a627ef039388cc6be5e9:dune-project +474ade77f279147fb20510c3425249bf:dune-project # end context for dune-project # begin context for opam/cobol_ast.opam # file opam/cobol_ast.opam -b6b1d67f29bbabc8a3825c45ead06ef4:opam/cobol_ast.opam +cd81f73b2943f40e9995f9e6385ee2bf:opam/cobol_ast.opam # end context for opam/cobol_ast.opam # begin context for opam/cobol_common.opam # file opam/cobol_common.opam -4f07f5a80400f64ce93c09c440d87cce:opam/cobol_common.opam +66a9fdbb37c258b3e83f645b9b29652a:opam/cobol_common.opam # end context for opam/cobol_common.opam # begin context for opam/cobol_config.opam # file opam/cobol_config.opam -01dcda62c118c85b3fbddcc53d8b917a:opam/cobol_config.opam +94dcce2bc73eb9b6bd93dc56f3e765fe:opam/cobol_config.opam # end context for opam/cobol_config.opam # begin context for opam/cobol_data.opam # file opam/cobol_data.opam -9c93ec4a7891cfacb4d760758ce081d2:opam/cobol_data.opam +84e4e132df53f8ee77d23d9e8d46e3dd:opam/cobol_data.opam # end context for opam/cobol_data.opam # begin context for opam/cobol_indent.opam @@ -110,12 +111,12 @@ c6fec16adad1f18d8439ee2d18c04b01:opam/cobol_indent.opam # begin context for opam/cobol_lsp.opam # file opam/cobol_lsp.opam -215c4e9546d425b936c48558800b7a1b:opam/cobol_lsp.opam +738b3855cf6d52fd27028289f752387e:opam/cobol_lsp.opam # end context for opam/cobol_lsp.opam # begin context for opam/cobol_parser.opam # file opam/cobol_parser.opam -84607566583632066b6be9dc55695442:opam/cobol_parser.opam +ca4a2140278e7f62ed96b3d4b0fd2744:opam/cobol_parser.opam # end context for opam/cobol_parser.opam # begin context for opam/cobol_preproc.opam @@ -125,7 +126,7 @@ f37dfd0c7c01be00342e0b10ebeabb91:opam/cobol_preproc.opam # begin context for opam/cobol_typeck.opam # file opam/cobol_typeck.opam -7c2fd4e5ba5059d4f91d11b7e769e058:opam/cobol_typeck.opam +0095d89de6e8a3a0b154bed10f1071bc:opam/cobol_typeck.opam # end context for opam/cobol_typeck.opam # begin context for opam/ebcdic_lib.opam @@ -190,7 +191,7 @@ dcf0ebaa8b12787df9efcaa0ce8cbbe5:opam/package-json.opam # begin context for opam/superbol_testutils.opam # file opam/superbol_testutils.opam -5af41508ad1bb17705a86126acf8a7c0:opam/superbol_testutils.opam +05a6cab04de68ff6aa6b4fb7e467c8ff:opam/superbol_testutils.opam # end context for opam/superbol_testutils.opam # begin context for opam/vscode-debugadapter.opam @@ -210,7 +211,7 @@ fa0d293d04760149271fed31ae820474:opam/vscode-js-stubs.opam # begin context for opam/vscode-json.opam # file opam/vscode-json.opam -36b75bd115cd632b5e384d559ace9a88:opam/vscode-json.opam +19a10d37d7e8e32e9346aba46935dfe9:opam/vscode-json.opam # end context for opam/vscode-json.opam # begin context for opam/vscode-languageclient-js-stubs.opam @@ -285,7 +286,7 @@ f4bbb4a41a8b3b39f19a4fc62a5f4841:sphinx/license.rst # begin context for src/lsp/cobol_common/dune # file src/lsp/cobol_common/dune -d8c6c287051b039df6db8f740973e784:src/lsp/cobol_common/dune +9edd2c6c082e67ed0b683e87e60c485e:src/lsp/cobol_common/dune # end context for src/lsp/cobol_common/dune # begin context for src/lsp/cobol_common/version.mlt @@ -305,7 +306,7 @@ d8c6c287051b039df6db8f740973e784:src/lsp/cobol_common/dune # begin context for src/lsp/cobol_data/dune # file src/lsp/cobol_data/dune -7d01cb2c52deab141e4a1c0517a4bb3b:src/lsp/cobol_data/dune +96aea17a4204c0956ed345a99db938f2:src/lsp/cobol_data/dune # end context for src/lsp/cobol_data/dune # begin context for src/lsp/cobol_data/version.mlt @@ -325,7 +326,7 @@ d8c6c287051b039df6db8f740973e784:src/lsp/cobol_common/dune # begin context for src/lsp/cobol_lsp/dune # file src/lsp/cobol_lsp/dune -f5b5ba58f2a9ef21787bfca4f4268580:src/lsp/cobol_lsp/dune +957f078deb602f8e0114c8abcc771abf:src/lsp/cobol_lsp/dune # end context for src/lsp/cobol_lsp/dune # begin context for src/lsp/cobol_lsp/version.mlt @@ -335,7 +336,7 @@ f5b5ba58f2a9ef21787bfca4f4268580:src/lsp/cobol_lsp/dune # begin context for src/lsp/cobol_parser/dune # file src/lsp/cobol_parser/dune -08706ca64cceec7220b7ffc2d654be97:src/lsp/cobol_parser/dune +6dd0111741c7ae8474d5bdea70ac7af9:src/lsp/cobol_parser/dune # end context for src/lsp/cobol_parser/dune # begin context for src/lsp/cobol_parser/version.mlt @@ -415,7 +416,7 @@ b9a14c96cce8e365e1d7494d078d73fe:src/lsp/superbol-free/linking_flags.sh # begin context for src/testing/superbol_testutils/dune # file src/testing/superbol_testutils/dune -7750c38b7b159782010b6ff0beaacab2:src/testing/superbol_testutils/dune +0da5d475bb1c2675efbab0a833620514:src/testing/superbol_testutils/dune # end context for src/testing/superbol_testutils/dune # begin context for src/testing/superbol_testutils/index.mld @@ -500,7 +501,7 @@ b9a14c96cce8e365e1d7494d078d73fe:src/lsp/superbol-free/linking_flags.sh # begin context for src/vscode/vscode-json/dune # file src/vscode/vscode-json/dune -a18d965350ea19e9be91b3784887f1ef:src/vscode/vscode-json/dune +452540098fd6ae61c5f364330d4ec493:src/vscode/vscode-json/dune # end context for src/vscode/vscode-json/dune # begin context for src/vscode/vscode-json/index.mld @@ -525,12 +526,12 @@ a18d965350ea19e9be91b3784887f1ef:src/vscode/vscode-json/dune # begin context for src/vscode/vscode-package-json/dune # file src/vscode/vscode-package-json/dune -1418db38f60b30eacfab7a22d0cc2ad7:src/vscode/vscode-package-json/dune +3daa53b1ba5e5b962bd4a4a2d126f35d:src/vscode/vscode-package-json/dune # end context for src/vscode/vscode-package-json/dune # begin context for src/vscode/vscode-package-json/linking_flags.sh # file src/vscode/vscode-package-json/linking_flags.sh -9fdfca3cc53df639758ff04fe09d3243:src/vscode/vscode-package-json/linking_flags.sh +91c1ee3f5f358d3e2ffe2e7031ca4363:src/vscode/vscode-package-json/linking_flags.sh # end context for src/vscode/vscode-package-json/linking_flags.sh # begin context for src/vscode/vscode-package-json/version.mlt diff --git a/Makefile.header b/Makefile.header index 7e49a3459..c11b88a3e 100644 --- a/Makefile.header +++ b/Makefile.header @@ -36,7 +36,13 @@ compile-release: opam-cross: drom dep --cross osx + rm -f opam/osx/*-js-*.opam + rm -f opam/osx/vscode-debug*.opam + rm -f opam/osx/*-vscode-*.opam drom dep --cross windows + rm -f opam/windows/*-js-*.opam + rm -f opam/windows/vscode-debug*.opam + rm -f opam/windows/*-vscode-*.opam # emacs-lsp: emacs/lsp-superbol-customs.el: $(LSP_MODE_SRCDIR) package.json diff --git a/dune-project b/dune-project index f4ac87148..742009e12 100644 --- a/dune-project +++ b/dune-project @@ -148,6 +148,7 @@ (description "This is the description\nof the superbol-studio-oss OCaml project\n") (depends (ocaml (>= 4.14.0)) + (ppx_deriving_encoding (and (>= 0.3.0) (< 1.0.0))) ezjsonm (ez_file (and (>= 0.3.0) (< 1.0.0))) (ppx_deriving_encoding (and (>= 0.3.0) (< 1.0.0))) @@ -240,8 +241,8 @@ (depends (ocaml (>= 4.14.0)) (pretty (= version)) - (ppx_deriving ( >= 5.2.1 )) (ocplib_stuff (and (>= 0.4.0) (< 1.0.0))) + (ppx_deriving ( >= 5.2.1 )) ppx_inline_test ppx_expect odoc @@ -255,14 +256,13 @@ (description "This is the description\nof the superbol-studio-oss OCaml project\n") (depends (ocaml (>= 4.14.0)) - (ppx_deriving ( >= 5.2.1 )) (menhir ( >= 1.2 )) (ez_file ( >= 0.3 )) (ebcdic_lib (= version)) (cobol_preproc (= version)) (cobol_common (= version)) (cobol_ast (= version)) - (autofonce_lib ( >= 0.8 )) + (ppx_deriving ( >= 5.2.1 )) (menhir ( = 20230415 )) ppx_inline_test ppx_expect @@ -292,7 +292,6 @@ (ocaml (>= 4.14.0)) (toml (and (>= 7.1.0) (< 8.0.0))) (pretty (= version)) - (ppx_expect ( >= v0.16 )) (lsp (and ( >= 1.15 )( < 1.16 ))) (jsonrpc ( >= 1.15 )) (cobol_typeck (= version)) @@ -301,6 +300,7 @@ (cobol_data (= version)) (cobol_config (= version)) (cobol_common (= version)) + (ppx_expect ( >= v0.16 )) ppx_inline_test ppx_expect odoc @@ -344,9 +344,9 @@ (depends (ocaml (>= 4.14.0)) (pretty (= version)) - (ppx_deriving ( >= 5.2.1 )) (menhir ( >= 1.2 )) (cobol_common (= version)) + (ppx_deriving ( >= 5.2.1 )) ppx_inline_test ppx_expect odoc @@ -360,8 +360,8 @@ (description "This is the description\nof the superbol-studio-oss OCaml project\n") (depends (ocaml (>= 4.14.0)) - (ppx_deriving ( >= 5.2.1 )) (cobol_common (= version)) + (ppx_deriving ( >= 5.2.1 )) ppx_inline_test ppx_expect odoc @@ -408,9 +408,9 @@ (description "This is the description\nof the superbol-studio-oss OCaml project\n") (depends (ocaml (>= 4.14.0)) - (ppx_deriving ( >= 5.2.1 )) (cobol_parser (= version)) (cobol_ast (= version)) + (ppx_deriving ( >= 5.2.1 )) (alcotest ( >= 1 )) ppx_inline_test ppx_expect @@ -425,11 +425,11 @@ (description "This is the description\nof the superbol-studio-oss OCaml project\n") (depends (ocaml (>= 4.14.0)) - (ppx_deriving ( >= 5.2.1 )) (cobol_parser (= version)) (cobol_data (= version)) (cobol_common (= version)) (cobol_ast (= version)) + (ppx_deriving ( >= 5.2.1 )) ppx_inline_test ppx_expect odoc @@ -443,6 +443,7 @@ (description "This is the description\nof the superbol-studio-oss OCaml project\n") (depends (ocaml (>= 4.14.0)) + (autofonce_lib ( >= 0.8 )) ppx_inline_test ppx_expect odoc diff --git a/opam/cobol_ast.opam b/opam/cobol_ast.opam index c8c54d127..0fbf64599 100644 --- a/opam/cobol_ast.opam +++ b/opam/cobol_ast.opam @@ -48,8 +48,8 @@ install: [ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} "cobol_common" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} diff --git a/opam/cobol_common.opam b/opam/cobol_common.opam index f10f352ab..f437b1d69 100644 --- a/opam/cobol_common.opam +++ b/opam/cobol_common.opam @@ -49,8 +49,8 @@ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} "pretty" {= version} - "ppx_deriving" {>= "5.2.1"} "ocplib_stuff" {>= "0.4.0" & < "1.0.0"} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} diff --git a/opam/cobol_config.opam b/opam/cobol_config.opam index b92af80d8..5e396d3da 100644 --- a/opam/cobol_config.opam +++ b/opam/cobol_config.opam @@ -49,9 +49,9 @@ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} "pretty" {= version} - "ppx_deriving" {>= "5.2.1"} "menhir" {>= "1.2"} "cobol_common" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} diff --git a/opam/cobol_data.opam b/opam/cobol_data.opam index f40f9ea41..c020c22b4 100644 --- a/opam/cobol_data.opam +++ b/opam/cobol_data.opam @@ -48,9 +48,9 @@ install: [ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} "cobol_parser" {= version} "cobol_ast" {= version} + "ppx_deriving" {>= "5.2.1"} "alcotest" {>= "1" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} diff --git a/opam/cobol_lsp.opam b/opam/cobol_lsp.opam index acb485173..6651c2dad 100644 --- a/opam/cobol_lsp.opam +++ b/opam/cobol_lsp.opam @@ -50,7 +50,6 @@ depends: [ "dune" {>= "2.8.0"} "toml" {>= "7.1.0" & < "8.0.0"} "pretty" {= version} - "ppx_expect" {>= "v0.16" with-test} "lsp" {>= "1.15" & < "1.16"} "jsonrpc" {>= "1.15"} "cobol_typeck" {= version} @@ -59,6 +58,7 @@ depends: [ "cobol_data" {= version} "cobol_config" {= version} "cobol_common" {= version} + "ppx_expect" {>= "v0.16" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} diff --git a/opam/cobol_parser.opam b/opam/cobol_parser.opam index 1ab1f3693..108d9999a 100644 --- a/opam/cobol_parser.opam +++ b/opam/cobol_parser.opam @@ -48,14 +48,13 @@ install: [ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} "menhir" {>= "1.2"} "ez_file" {>= "0.3"} "ebcdic_lib" {= version} "cobol_preproc" {= version} "cobol_common" {= version} "cobol_ast" {= version} - "autofonce_lib" {>= "0.8"} + "ppx_deriving" {>= "5.2.1"} "menhir" {= "20230415"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} diff --git a/opam/cobol_typeck.opam b/opam/cobol_typeck.opam index 04c98cb91..150b0b350 100644 --- a/opam/cobol_typeck.opam +++ b/opam/cobol_typeck.opam @@ -48,11 +48,11 @@ install: [ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} "cobol_parser" {= version} "cobol_data" {= version} "cobol_common" {= version} "cobol_ast" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} diff --git a/opam/osx/cobol_ast-osx.opam b/opam/osx/cobol_ast-osx.opam index b98f56e40..8eb6916ea 100644 --- a/opam/osx/cobol_ast-osx.opam +++ b/opam/osx/cobol_ast-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_ast" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,14 +48,13 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-osx" {>= "5.2.1"} "cobol_common-osx" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_common-osx.opam b/opam/osx/cobol_common-osx.opam index f919ccae7..d3b21b15d 100644 --- a/opam/osx/cobol_common-osx.opam +++ b/opam/osx/cobol_common-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_common" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,14 +48,13 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-osx" {>= "5.2.1"} "pretty-osx" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_config-osx.opam b/opam/osx/cobol_config-osx.opam index e5219e452..15f08f53e 100644 --- a/opam/osx/cobol_config-osx.opam +++ b/opam/osx/cobol_config-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_config" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,17 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-osx" {>= "5.2.1"} - "menhir" {>= "1.2"} - "menhir-osx" {>= "1.2"} "pretty-osx" {= version} + "menhir-osx" {>= "1.2"} "cobol_common-osx" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_data-osx.opam b/opam/osx/cobol_data-osx.opam index 2beae7465..b51d379e5 100644 --- a/opam/osx/cobol_data-osx.opam +++ b/opam/osx/cobol_data-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_data" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,15 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-osx" {>= "5.2.1"} "cobol_parser-osx" {= version} "cobol_ast-osx" {= version} + "ppx_deriving" {>= "5.2.1"} + "alcotest" {>= "1" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_indent-osx.opam b/opam/osx/cobol_indent-osx.opam index c121b36c6..41a76159a 100644 --- a/opam/osx/cobol_indent-osx.opam +++ b/opam/osx/cobol_indent-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_indent" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,9 +48,8 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "fmt" {>= "0.9"} "fmt-osx" {>= "0.9"} "cobol_preproc-osx" {= version} "cobol_common-osx" {= version} @@ -55,4 +58,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_lsp-osx.opam b/opam/osx/cobol_lsp-osx.opam index b2c67c94c..7ae7423d2 100644 --- a/opam/osx/cobol_lsp-osx.opam +++ b/opam/osx/cobol_lsp-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_lsp" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,24 +48,22 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "toml" {>= "7.1.0" & < "8.0.0"} "toml-osx" {>= "7.1.0" & < "8.0.0"} - "lsp" {>= "1.15" & < "1.16"} + "pretty-osx" {= version} "lsp-osx" {>= "1.15" & < "1.16"} - "jsonrpc" {>= "1.15"} "jsonrpc-osx" {>= "1.15"} - "pretty-osx" {= version} "cobol_typeck-osx" {= version} "cobol_parser-osx" {= version} "cobol_indent-osx" {= version} "cobol_data-osx" {= version} "cobol_config-osx" {= version} "cobol_common-osx" {= version} + "ppx_expect" {>= "v0.16" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_parser-osx.opam b/opam/osx/cobol_parser-osx.opam index 2dd6e76fb..22a54feb2 100644 --- a/opam/osx/cobol_parser-osx.opam +++ b/opam/osx/cobol_parser-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_parser" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,21 +48,20 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-osx" {>= "5.2.1"} - "ez_file" {>= "0.3"} - "ez_file-osx" {>= "0.3"} - "menhir" {= "20230415"} "menhir-osx" {>= "1.2"} + "ez_file-osx" {>= "0.3"} "ebcdic_lib-osx" {= version} "cobol_preproc-osx" {= version} "cobol_common-osx" {= version} "cobol_ast-osx" {= version} + "autofonce_lib-osx" {>= "0.8" with-test} + "ppx_deriving" {>= "5.2.1"} + "menhir" {= "20230415"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_preproc-osx.opam b/opam/osx/cobol_preproc-osx.opam index ac9d526a5..41c5c3ab6 100644 --- a/opam/osx/cobol_preproc-osx.opam +++ b/opam/osx/cobol_preproc-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_preproc" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,11 +48,9 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} "ppx_deriving-osx" {>= "5.2.1"} - "menhir" {>= "1.2"} "menhir-osx" {>= "1.2"} "cobol_config-osx" {= version} "cobol_common-osx" {= version} @@ -57,4 +59,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/cobol_typeck-osx.opam b/opam/osx/cobol_typeck-osx.opam index 39e948cc4..7719caca5 100644 --- a/opam/osx/cobol_typeck-osx.opam +++ b/opam/osx/cobol_typeck-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_typeck" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,17 +48,16 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-osx" {>= "5.2.1"} "cobol_parser-osx" {= version} "cobol_data-osx" {= version} "cobol_common-osx" {= version} "cobol_ast-osx" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/ebcdic_lib-osx.opam b/opam/osx/ebcdic_lib-osx.opam index 25b73b738..2dd962c2c 100644 --- a/opam/osx/ebcdic_lib-osx.opam +++ b/opam/osx/ebcdic_lib-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "ebcdic_lib" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,11 +48,11 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/interop-js-stubs.opam b/opam/osx/interop-js-stubs.opam deleted file mode 120000 index 01aaec38e..000000000 --- a/opam/osx/interop-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../interop-js-stubs.opam \ No newline at end of file diff --git a/opam/osx/node-js-stubs.opam b/opam/osx/node-js-stubs.opam deleted file mode 120000 index f48794e51..000000000 --- a/opam/osx/node-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../node-js-stubs.opam \ No newline at end of file diff --git a/opam/osx/polka-js-stubs.opam b/opam/osx/polka-js-stubs.opam deleted file mode 120000 index a4f58558a..000000000 --- a/opam/osx/polka-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../polka-js-stubs.opam \ No newline at end of file diff --git a/opam/osx/ppx_cobcflags-osx.opam b/opam/osx/ppx_cobcflags-osx.opam index d1aebfd02..48770756f 100644 --- a/opam/osx/ppx_cobcflags-osx.opam +++ b/opam/osx/ppx_cobcflags-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "ppx_cobcflags" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,13 +48,12 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppxlib" {>= "0.15"} "ppxlib-osx" {>= "0.15"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/pretty-osx.opam b/opam/osx/pretty-osx.opam index 6213dbf31..fde9976b5 100644 --- a/opam/osx/pretty-osx.opam +++ b/opam/osx/pretty-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "pretty" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,15 +48,13 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "fmt" {>= "0.9"} "fmt-osx" {>= "0.9"} - "ez_file" {>= "0.3"} "ez_file-osx" {>= "0.3"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/superbol-free-osx.opam b/opam/osx/superbol-free-osx.opam index dfca5199d..5c4a30015 100644 --- a/opam/osx/superbol-free-osx.opam +++ b/opam/osx/superbol-free-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "superbol-free" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,7 +48,7 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} "superbol_free_lib-osx" {= version} "ppx_inline_test" {with-test} @@ -52,4 +56,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/superbol-vscode-extension.opam b/opam/osx/superbol-vscode-extension.opam deleted file mode 120000 index d9c5d6741..000000000 --- a/opam/osx/superbol-vscode-extension.opam +++ /dev/null @@ -1 +0,0 @@ -../superbol-vscode-extension.opam \ No newline at end of file diff --git a/opam/osx/superbol_free_lib-osx.opam b/opam/osx/superbol_free_lib-osx.opam index 7cb1d2ad4..ef2215b22 100644 --- a/opam/osx/superbol_free_lib-osx.opam +++ b/opam/osx/superbol_free_lib-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "superbol_free_lib" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,11 +48,9 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ez_file" {>= "0.3"} "ez_file-osx" {>= "0.3"} - "ez_cmdliner" {>= "0.3.0" & < "1.0.0"} "ez_cmdliner-osx" {>= "0.3.0" & < "1.0.0"} "cobol_typeck-osx" {= version} "cobol_parser-osx" {= version} @@ -61,4 +63,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/superbol_testutils-osx.opam b/opam/osx/superbol_testutils-osx.opam new file mode 100644 index 000000000..0ed788923 --- /dev/null +++ b/opam/osx/superbol_testutils-osx.opam @@ -0,0 +1,58 @@ +# This file was generated by `drom` from `drom.toml`. +# Do not modify, or add to the `skip` field of `drom.toml`. +opam-version: "2.0" +name: "superbol_testutils" +version: "0.1.0" +license: "MIT" +synopsis: "The superbol-studio-oss project" +description: """\ +This is the description +of the superbol-studio-oss OCaml project +""" +authors: [ + "Nicolas Berthier " + "David Declerck " + "Fabrice Le Fessant " + "Emilien Lemaire " +] +maintainer: [ + "Nicolas Berthier " + "David Declerck " + "Fabrice Le Fessant " + "Emilien Lemaire " +] +homepage: "https://ocamlpro.github.io/superbol-vscode-platform" +doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx" +bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues" +dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git" +tags: "org:ocamlpro" +build: [ + ["dune" "subst"] {dev} + ["sh" "-c" "./scripts/before.sh build '%{name}%'"] + [ + "dune" + "build" + "-p" + "superbol_testutils" + "-x" + "osx" + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] + ["sh" "-c" "./scripts/after.sh build '%{name}%'"] +] +install: [ + ["sh" "-c" "./scripts/before.sh install '%{name}%'"] +] +depends: [ + "ocaml" {>= "4.14.0"} + "dune" {>= "2.8.0"} + "ppx_inline_test" {with-test} + "ppx_expect" {with-test} + "odoc" {with-doc} + "ocamlformat" {with-test} +] +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/vscode-debugadapter.opam b/opam/osx/vscode-debugadapter.opam deleted file mode 120000 index 39b68502c..000000000 --- a/opam/osx/vscode-debugadapter.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-debugadapter.opam \ No newline at end of file diff --git a/opam/osx/vscode-debugprotocol.opam b/opam/osx/vscode-debugprotocol.opam deleted file mode 120000 index 659cc026c..000000000 --- a/opam/osx/vscode-debugprotocol.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-debugprotocol.opam \ No newline at end of file diff --git a/opam/osx/vscode-js-stubs.opam b/opam/osx/vscode-js-stubs.opam deleted file mode 120000 index ab4d0b08e..000000000 --- a/opam/osx/vscode-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-js-stubs.opam \ No newline at end of file diff --git a/opam/osx/vscode-json-osx.opam b/opam/osx/vscode-json-osx.opam index 30f21832b..798caceb7 100644 --- a/opam/osx/vscode-json-osx.opam +++ b/opam/osx/vscode-json-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "vscode-json" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,17 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ezjsonm" {} + "ppx_deriving_encoding-osx" {>= "0.3.0" & < "1.0.0"} "ezjsonm-osx" {} - "ez_file" {>= "0.3.0" & < "1.0.0"} "ez_file-osx" {>= "0.3.0" & < "1.0.0"} "ppx_deriving_encoding" {>= "0.3.0" & < "1.0.0"} - "ppx_deriving_encoding-osx" {>= "0.3.0" & < "1.0.0"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/osx/vscode-languageclient-js-stubs.opam b/opam/osx/vscode-languageclient-js-stubs.opam deleted file mode 120000 index 099a504e4..000000000 --- a/opam/osx/vscode-languageclient-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-languageclient-js-stubs.opam \ No newline at end of file diff --git a/opam/osx/vscode-package-json-osx.opam b/opam/osx/vscode-package-json-osx.opam index fe7c0e081..b377eb905 100644 --- a/opam/osx/vscode-package-json-osx.opam +++ b/opam/osx/vscode-package-json-osx.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "vscode-package-json" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,18 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-osx" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ezjsonm" {} + "vscode-json-osx" {= version} "ezjsonm-osx" {} - "ez_file" {>= "0.3.0" & < "1.0.0"} "ez_file-osx" {>= "0.3.0" & < "1.0.0"} "ppx_deriving_encoding" {} - "ppx_deriving_encoding-osx" {} - "vscode-json-osx" {= version} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/superbol_testutils.opam b/opam/superbol_testutils.opam index 0699c5a1a..33e1887c7 100644 --- a/opam/superbol_testutils.opam +++ b/opam/superbol_testutils.opam @@ -48,6 +48,7 @@ install: [ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} + "autofonce_lib" {>= "0.8" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} diff --git a/opam/vscode-json.opam b/opam/vscode-json.opam index 2cdff7d7f..a2f189ffc 100644 --- a/opam/vscode-json.opam +++ b/opam/vscode-json.opam @@ -48,6 +48,7 @@ install: [ depends: [ "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} + "ppx_deriving_encoding" {>= "0.3.0" & < "1.0.0"} "ezjsonm" {} "ez_file" {>= "0.3.0" & < "1.0.0"} "ppx_deriving_encoding" {>= "0.3.0" & < "1.0.0"} diff --git a/opam/windows/cobol_ast-windows.opam b/opam/windows/cobol_ast-windows.opam index 23e798514..a6888582e 100644 --- a/opam/windows/cobol_ast-windows.opam +++ b/opam/windows/cobol_ast-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_ast" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,14 +48,13 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-windows" {>= "5.2.1"} "cobol_common-windows" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_common-windows.opam b/opam/windows/cobol_common-windows.opam index 795923be1..446513187 100644 --- a/opam/windows/cobol_common-windows.opam +++ b/opam/windows/cobol_common-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_common" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,14 +48,13 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-windows" {>= "5.2.1"} "pretty-windows" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_config-windows.opam b/opam/windows/cobol_config-windows.opam index 53b2c0598..a92b61f18 100644 --- a/opam/windows/cobol_config-windows.opam +++ b/opam/windows/cobol_config-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_config" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,17 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-windows" {>= "5.2.1"} - "menhir" {>= "1.2"} - "menhir-windows" {>= "1.2"} "pretty-windows" {= version} + "menhir-windows" {>= "1.2"} "cobol_common-windows" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_data-windows.opam b/opam/windows/cobol_data-windows.opam index 4d29ed158..42c5f2957 100644 --- a/opam/windows/cobol_data-windows.opam +++ b/opam/windows/cobol_data-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_data" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,15 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-windows" {>= "5.2.1"} "cobol_parser-windows" {= version} "cobol_ast-windows" {= version} + "ppx_deriving" {>= "5.2.1"} + "alcotest" {>= "1" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_indent-windows.opam b/opam/windows/cobol_indent-windows.opam index 84c36250b..0b42790ec 100644 --- a/opam/windows/cobol_indent-windows.opam +++ b/opam/windows/cobol_indent-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_indent" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,9 +48,8 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "fmt" {>= "0.9"} "fmt-windows" {>= "0.9"} "cobol_preproc-windows" {= version} "cobol_common-windows" {= version} @@ -55,4 +58,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_lsp-windows.opam b/opam/windows/cobol_lsp-windows.opam index d8f251430..7590cbe98 100644 --- a/opam/windows/cobol_lsp-windows.opam +++ b/opam/windows/cobol_lsp-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_lsp" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,24 +48,22 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "toml" {>= "7.1.0" & < "8.0.0"} "toml-windows" {>= "7.1.0" & < "8.0.0"} - "lsp" {>= "1.15" & < "1.16"} + "pretty-windows" {= version} "lsp-windows" {>= "1.15" & < "1.16"} - "jsonrpc" {>= "1.15"} "jsonrpc-windows" {>= "1.15"} - "pretty-windows" {= version} "cobol_typeck-windows" {= version} "cobol_parser-windows" {= version} "cobol_indent-windows" {= version} "cobol_data-windows" {= version} "cobol_config-windows" {= version} "cobol_common-windows" {= version} + "ppx_expect" {>= "v0.16" with-test} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_parser-windows.opam b/opam/windows/cobol_parser-windows.opam index af24f6427..168c5bb87 100644 --- a/opam/windows/cobol_parser-windows.opam +++ b/opam/windows/cobol_parser-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_parser" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,21 +48,20 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-windows" {>= "5.2.1"} - "ez_file" {>= "0.3"} - "ez_file-windows" {>= "0.3"} - "menhir" {= "20230415"} "menhir-windows" {>= "1.2"} + "ez_file-windows" {>= "0.3"} "ebcdic_lib-windows" {= version} "cobol_preproc-windows" {= version} "cobol_common-windows" {= version} "cobol_ast-windows" {= version} + "autofonce_lib-windows" {>= "0.8" with-test} + "ppx_deriving" {>= "5.2.1"} + "menhir" {= "20230415"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_preproc-windows.opam b/opam/windows/cobol_preproc-windows.opam index adb5d4122..8e8e28957 100644 --- a/opam/windows/cobol_preproc-windows.opam +++ b/opam/windows/cobol_preproc-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_preproc" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,11 +48,9 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} "ppx_deriving-windows" {>= "5.2.1"} - "menhir" {>= "1.2"} "menhir-windows" {>= "1.2"} "cobol_config-windows" {= version} "cobol_common-windows" {= version} @@ -57,4 +59,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/cobol_typeck-windows.opam b/opam/windows/cobol_typeck-windows.opam index 0b131d192..1fb135c59 100644 --- a/opam/windows/cobol_typeck-windows.opam +++ b/opam/windows/cobol_typeck-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "cobol_typeck" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,17 +48,16 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppx_deriving" {>= "5.2.1"} - "ppx_deriving-windows" {>= "5.2.1"} "cobol_parser-windows" {= version} "cobol_data-windows" {= version} "cobol_common-windows" {= version} "cobol_ast-windows" {= version} + "ppx_deriving" {>= "5.2.1"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/ebcdic_lib-windows.opam b/opam/windows/ebcdic_lib-windows.opam index 51ea4065f..787524c56 100644 --- a/opam/windows/ebcdic_lib-windows.opam +++ b/opam/windows/ebcdic_lib-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "ebcdic_lib" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,11 +48,11 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/interop-js-stubs.opam b/opam/windows/interop-js-stubs.opam deleted file mode 120000 index 01aaec38e..000000000 --- a/opam/windows/interop-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../interop-js-stubs.opam \ No newline at end of file diff --git a/opam/windows/node-js-stubs.opam b/opam/windows/node-js-stubs.opam deleted file mode 120000 index f48794e51..000000000 --- a/opam/windows/node-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../node-js-stubs.opam \ No newline at end of file diff --git a/opam/windows/polka-js-stubs.opam b/opam/windows/polka-js-stubs.opam deleted file mode 120000 index a4f58558a..000000000 --- a/opam/windows/polka-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../polka-js-stubs.opam \ No newline at end of file diff --git a/opam/windows/ppx_cobcflags-windows.opam b/opam/windows/ppx_cobcflags-windows.opam index f51fd62c6..3020b47af 100644 --- a/opam/windows/ppx_cobcflags-windows.opam +++ b/opam/windows/ppx_cobcflags-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "ppx_cobcflags" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,13 +48,12 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ppxlib" {>= "0.15"} "ppxlib-windows" {>= "0.15"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/pretty-windows.opam b/opam/windows/pretty-windows.opam index c5dcf363a..9a3910172 100644 --- a/opam/windows/pretty-windows.opam +++ b/opam/windows/pretty-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "pretty" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,15 +48,13 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "fmt" {>= "0.9"} "fmt-windows" {>= "0.9"} - "ez_file" {>= "0.3"} "ez_file-windows" {>= "0.3"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/superbol-free-windows.opam b/opam/windows/superbol-free-windows.opam index fb0a88000..04f35bd37 100644 --- a/opam/windows/superbol-free-windows.opam +++ b/opam/windows/superbol-free-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "superbol-free" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,7 +48,7 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} "superbol_free_lib-windows" {= version} "ppx_inline_test" {with-test} @@ -52,4 +56,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/superbol-vscode-extension.opam b/opam/windows/superbol-vscode-extension.opam deleted file mode 120000 index d9c5d6741..000000000 --- a/opam/windows/superbol-vscode-extension.opam +++ /dev/null @@ -1 +0,0 @@ -../superbol-vscode-extension.opam \ No newline at end of file diff --git a/opam/windows/superbol_free_lib-windows.opam b/opam/windows/superbol_free_lib-windows.opam index 097859382..0d28f529d 100644 --- a/opam/windows/superbol_free_lib-windows.opam +++ b/opam/windows/superbol_free_lib-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "superbol_free_lib" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,11 +48,9 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ez_file" {>= "0.3"} "ez_file-windows" {>= "0.3"} - "ez_cmdliner" {>= "0.3.0" & < "1.0.0"} "ez_cmdliner-windows" {>= "0.3.0" & < "1.0.0"} "cobol_typeck-windows" {= version} "cobol_parser-windows" {= version} @@ -61,4 +63,4 @@ depends: [ "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/superbol_testutils-windows.opam b/opam/windows/superbol_testutils-windows.opam new file mode 100644 index 000000000..3cb28e7f9 --- /dev/null +++ b/opam/windows/superbol_testutils-windows.opam @@ -0,0 +1,58 @@ +# This file was generated by `drom` from `drom.toml`. +# Do not modify, or add to the `skip` field of `drom.toml`. +opam-version: "2.0" +name: "superbol_testutils" +version: "0.1.0" +license: "MIT" +synopsis: "The superbol-studio-oss project" +description: """\ +This is the description +of the superbol-studio-oss OCaml project +""" +authors: [ + "Nicolas Berthier " + "David Declerck " + "Fabrice Le Fessant " + "Emilien Lemaire " +] +maintainer: [ + "Nicolas Berthier " + "David Declerck " + "Fabrice Le Fessant " + "Emilien Lemaire " +] +homepage: "https://ocamlpro.github.io/superbol-vscode-platform" +doc: "https://ocamlpro.github.io/superbol-vscode-platform/sphinx" +bug-reports: "https://github.com/ocamlpro/superbol-vscode-platform/issues" +dev-repo: "git+https://github.com/ocamlpro/superbol-vscode-platform.git" +tags: "org:ocamlpro" +build: [ + ["dune" "subst"] {dev} + ["sh" "-c" "./scripts/before.sh build '%{name}%'"] + [ + "dune" + "build" + "-p" + "superbol_testutils" + "-x" + "windows" + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] + ["sh" "-c" "./scripts/after.sh build '%{name}%'"] +] +install: [ + ["sh" "-c" "./scripts/before.sh install '%{name}%'"] +] +depends: [ + "ocaml" {>= "4.14.0"} + "dune" {>= "2.8.0"} + "ppx_inline_test" {with-test} + "ppx_expect" {with-test} + "odoc" {with-doc} + "ocamlformat" {with-test} +] +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/vscode-debugadapter.opam b/opam/windows/vscode-debugadapter.opam deleted file mode 120000 index 39b68502c..000000000 --- a/opam/windows/vscode-debugadapter.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-debugadapter.opam \ No newline at end of file diff --git a/opam/windows/vscode-debugprotocol.opam b/opam/windows/vscode-debugprotocol.opam deleted file mode 120000 index 659cc026c..000000000 --- a/opam/windows/vscode-debugprotocol.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-debugprotocol.opam \ No newline at end of file diff --git a/opam/windows/vscode-js-stubs.opam b/opam/windows/vscode-js-stubs.opam deleted file mode 120000 index ab4d0b08e..000000000 --- a/opam/windows/vscode-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-js-stubs.opam \ No newline at end of file diff --git a/opam/windows/vscode-json-windows.opam b/opam/windows/vscode-json-windows.opam index 55d5f4909..7be95b13f 100644 --- a/opam/windows/vscode-json-windows.opam +++ b/opam/windows/vscode-json-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "vscode-json" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,17 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ezjsonm" {} + "ppx_deriving_encoding-windows" {>= "0.3.0" & < "1.0.0"} "ezjsonm-windows" {} - "ez_file" {>= "0.3.0" & < "1.0.0"} "ez_file-windows" {>= "0.3.0" & < "1.0.0"} "ppx_deriving_encoding" {>= "0.3.0" & < "1.0.0"} - "ppx_deriving_encoding-windows" {>= "0.3.0" & < "1.0.0"} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/opam/windows/vscode-languageclient-js-stubs.opam b/opam/windows/vscode-languageclient-js-stubs.opam deleted file mode 120000 index 099a504e4..000000000 --- a/opam/windows/vscode-languageclient-js-stubs.opam +++ /dev/null @@ -1 +0,0 @@ -../vscode-languageclient-js-stubs.opam \ No newline at end of file diff --git a/opam/windows/vscode-package-json-windows.opam b/opam/windows/vscode-package-json-windows.opam index 2f537c528..e385b119d 100644 --- a/opam/windows/vscode-package-json-windows.opam +++ b/opam/windows/vscode-package-json-windows.opam @@ -4,16 +4,20 @@ opam-version: "2.0" name: "vscode-package-json" version: "0.1.0" license: "MIT" -synopsis: "The superbol-vscode-platform project" +synopsis: "The superbol-studio-oss project" description: """\ This is the description -of the superbol-vscode-platform OCaml project +of the superbol-studio-oss OCaml project """ authors: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] maintainer: [ + "Nicolas Berthier " + "David Declerck " "Fabrice Le Fessant " "Emilien Lemaire " ] @@ -44,18 +48,15 @@ install: [ ["sh" "-c" "./scripts/before.sh install '%{name}%'"] ] depends: [ - "ocaml-windows" {>= "4.13.0"} + "ocaml" {>= "4.14.0"} "dune" {>= "2.8.0"} - "ezjsonm" {} + "vscode-json-windows" {= version} "ezjsonm-windows" {} - "ez_file" {>= "0.3.0" & < "1.0.0"} "ez_file-windows" {>= "0.3.0" & < "1.0.0"} "ppx_deriving_encoding" {} - "ppx_deriving_encoding-windows" {} - "vscode-json-windows" {= version} "ppx_inline_test" {with-test} "ppx_expect" {with-test} "odoc" {with-doc} "ocamlformat" {with-test} ] -# Content of `opam-trailer` field: +# Content of `opam-trailer` field: \ No newline at end of file diff --git a/src/lsp/cobol_ast/dune b/src/lsp/cobol_ast/dune index 05db5b229..6c1dd8e95 100644 --- a/src/lsp/cobol_ast/dune +++ b/src/lsp/cobol_ast/dune @@ -5,7 +5,7 @@ (public_name cobol_ast) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries ppx_deriving cobol_common ) + (libraries cobol_common ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_ast/package.toml b/src/lsp/cobol_ast/package.toml index c7b3dd71c..42ee07a7c 100644 --- a/src/lsp/cobol_ast/package.toml +++ b/src/lsp/cobol_ast/package.toml @@ -54,11 +54,10 @@ skip = ["index.mld"] # base-unix = { libname = "unix", version = ">=base" } [dependencies] cobol_common = "version" -ppx_deriving = ">=5.2.1" # package tools dependencies [tools] -# ... +ppx_deriving = ">=5.2.1" # package fields (depends on package skeleton) #Examples: diff --git a/src/lsp/cobol_common/dune b/src/lsp/cobol_common/dune index bfee68599..17f8bfd88 100644 --- a/src/lsp/cobol_common/dune +++ b/src/lsp/cobol_common/dune @@ -5,7 +5,7 @@ (public_name cobol_common) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries pretty ppx_deriving ocplib_stuff str) + (libraries pretty ocplib_stuff str) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_common/package.toml b/src/lsp/cobol_common/package.toml index c926d1010..1d9c1b1a9 100644 --- a/src/lsp/cobol_common/package.toml +++ b/src/lsp/cobol_common/package.toml @@ -53,13 +53,12 @@ skip = ["main.ml", "index.mld"] # ez_file = ">=0.1 <1.3" # base-unix = { libname = "unix", version = ">=base" } [dependencies] -ppx_deriving = ">=5.2.1" ocplib_stuff = "0.4.0" pretty = "version" # package tools dependencies [tools] -# ... +ppx_deriving = ">=5.2.1" # package fields (depends on package skeleton) #Examples: diff --git a/src/lsp/cobol_config/dune b/src/lsp/cobol_config/dune index 83040b777..99166814f 100644 --- a/src/lsp/cobol_config/dune +++ b/src/lsp/cobol_config/dune @@ -5,7 +5,7 @@ (public_name cobol_config) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries pretty ppx_deriving menhirLib cobol_common ) + (libraries pretty menhirLib cobol_common ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_config/package.toml b/src/lsp/cobol_config/package.toml index 848370474..4f82516f6 100644 --- a/src/lsp/cobol_config/package.toml +++ b/src/lsp/cobol_config/package.toml @@ -54,7 +54,6 @@ skip = ["main.ml", "index.mld"] # base-unix = { libname = "unix", version = ">=base" } [dependencies] cobol_common = "version" -ppx_deriving = ">=5.2.1" pretty = "version" [dependencies.menhir] libname = "menhirLib" @@ -62,7 +61,7 @@ version = ">=1.2" # package tools dependencies [tools] -# ... +ppx_deriving = ">=5.2.1" # package fields (depends on package skeleton) #Examples: diff --git a/src/lsp/cobol_data/dune b/src/lsp/cobol_data/dune index a964e8783..1c97a86be 100644 --- a/src/lsp/cobol_data/dune +++ b/src/lsp/cobol_data/dune @@ -5,7 +5,7 @@ (public_name cobol_data) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries ppx_deriving cobol_parser cobol_ast alcotest ) + (libraries cobol_parser cobol_ast ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_data/package.toml b/src/lsp/cobol_data/package.toml index bec6adf8c..08a27585f 100644 --- a/src/lsp/cobol_data/package.toml +++ b/src/lsp/cobol_data/package.toml @@ -55,12 +55,11 @@ skip = ["index.mld"] [dependencies] cobol_ast = "version" cobol_parser = "version" -ppx_deriving = ">=5.2.1" -alcotest = { version = "1", for-test = true } # package tools dependencies [tools] -# ... +ppx_deriving = ">=5.2.1" +alcotest = { version = "1", for-test = true } # package fields (depends on package skeleton) #Examples: diff --git a/src/lsp/cobol_lsp/dune b/src/lsp/cobol_lsp/dune index fb338ff7b..97e0418cf 100644 --- a/src/lsp/cobol_lsp/dune +++ b/src/lsp/cobol_lsp/dune @@ -5,7 +5,7 @@ (public_name cobol_lsp) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries toml pretty ppx_expect lsp jsonrpc cobol_typeck cobol_parser cobol_indent cobol_data cobol_config cobol_common ) + (libraries toml pretty lsp jsonrpc cobol_typeck cobol_parser cobol_indent cobol_data cobol_config cobol_common ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_lsp/package.toml b/src/lsp/cobol_lsp/package.toml index 383674bfc..e6189a5d9 100644 --- a/src/lsp/cobol_lsp/package.toml +++ b/src/lsp/cobol_lsp/package.toml @@ -63,11 +63,10 @@ jsonrpc = ">=1.15" lsp = ">=1.15 <1.16" pretty = "version" toml = "7.1.0" -ppx_expect = { version = ">=v0.16", for-test = true } # package tools dependencies [tools] -# ... +ppx_expect = { version = ">=v0.16", for-test = true } # package fields (depends on package skeleton) #Examples: diff --git a/src/lsp/cobol_parser/dune b/src/lsp/cobol_parser/dune index ebe0b2d45..a6994db5c 100644 --- a/src/lsp/cobol_parser/dune +++ b/src/lsp/cobol_parser/dune @@ -5,7 +5,7 @@ (public_name cobol_parser) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries ppx_deriving menhirLib ez_file ebcdic_lib cobol_preproc cobol_common cobol_ast autofonce_lib str) + (libraries menhirLib ez_file ebcdic_lib cobol_preproc cobol_common cobol_ast str) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_parser/package.toml b/src/lsp/cobol_parser/package.toml index d61b8ed75..c0d11ca62 100644 --- a/src/lsp/cobol_parser/package.toml +++ b/src/lsp/cobol_parser/package.toml @@ -58,8 +58,7 @@ cobol_common = "version" cobol_preproc = "version" ebcdic_lib = "version" ez_file = ">=0.3" -ppx_deriving = ">=5.2.1" -autofonce_lib = ">=0.8" +# autofonce_lib = { version = ">=0.8", for-test = true } [dependencies.menhir] libname = "menhirLib" @@ -67,6 +66,7 @@ version = ">=1.2" # package tools dependencies [tools] +ppx_deriving = ">=5.2.1" menhir = "=20230415" # package fields (depends on package skeleton) diff --git a/src/lsp/cobol_typeck/dune b/src/lsp/cobol_typeck/dune index 9b9c25af8..959875f3a 100644 --- a/src/lsp/cobol_typeck/dune +++ b/src/lsp/cobol_typeck/dune @@ -5,7 +5,7 @@ (public_name cobol_typeck) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries ppx_deriving cobol_parser cobol_data cobol_common cobol_ast ) + (libraries cobol_parser cobol_data cobol_common cobol_ast ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/lsp/cobol_typeck/package.toml b/src/lsp/cobol_typeck/package.toml index 147eb4f35..6c8d895ad 100644 --- a/src/lsp/cobol_typeck/package.toml +++ b/src/lsp/cobol_typeck/package.toml @@ -57,11 +57,10 @@ cobol_ast = "version" cobol_common = "version" cobol_data = "version" cobol_parser = "version" -ppx_deriving = ">=5.2.1" # package tools dependencies [tools] -# ... +ppx_deriving = ">=5.2.1" # package fields (depends on package skeleton) #Examples: diff --git a/src/testing/superbol_testutils/dune b/src/testing/superbol_testutils/dune index e73ca30b9..6581c050f 100644 --- a/src/testing/superbol_testutils/dune +++ b/src/testing/superbol_testutils/dune @@ -5,7 +5,7 @@ (public_name superbol_testutils) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries ) + (libraries autofonce_lib ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/testing/superbol_testutils/package.toml b/src/testing/superbol_testutils/package.toml index 4feafaa6f..827529cf2 100644 --- a/src/testing/superbol_testutils/package.toml +++ b/src/testing/superbol_testutils/package.toml @@ -53,7 +53,7 @@ gen-version = "version.ml" # ez_file = ">=0.1 <1.3" # base-unix = { libname = "unix", version = ">=base" } [dependencies] -# ... +autofonce_lib = { version = ">=0.8", for-test = true } # package tools dependencies [tools] diff --git a/src/vscode/vscode-json/dune b/src/vscode/vscode-json/dune index f9b53b63b..2b0a14eb7 100644 --- a/src/vscode/vscode-json/dune +++ b/src/vscode/vscode-json/dune @@ -5,7 +5,7 @@ (public_name vscode-json) (wrapped true) ; use field 'dune-libraries' to add libraries without opam deps - (libraries ezjsonm ez_file ) + (libraries ppx_deriving_encoding ezjsonm ez_file ) ; use field 'dune-flags' to set this value (flags (:standard)) ; use field 'dune-stanzas' to add more stanzas here diff --git a/src/vscode/vscode-json/linking_flags.sh.drom-tpl b/src/vscode/vscode-json/linking_flags.sh.drom-tpl new file mode 100644 index 000000000..f7d60d8d2 --- /dev/null +++ b/src/vscode/vscode-json/linking_flags.sh.drom-tpl @@ -0,0 +1,79 @@ +#!/bin/sh + +set -ue + +# This script is called by dune to generate the linking flags for static builds +# (on the limited set of supported platforms). It only returns an empty set of +# flags for the default dynamic linking mode. + +LC_ALL=C + +help_exit() { + echo "Usage: $0 descriptiveID dynamic|static linux|macosx [extra-libs]" >&2 + exit 2 +} + +echo2() { + echo "$*" >&2 + echo "$*" +} + +[ $# -lt 3 ] && help_exit + +descID="$1" +shift + +echo2 ";; $descID" +echo2 ";; generated by $0" + +case "$1" in + dynamic) echo2 "()"; exit 0;; + static) ;; + *) echo "Invalid linking mode '$1'." >&2; help_exit +esac + +shift + +## Static linking configuration ## + +# The linked C libraries list may need updating on changes to the dependencies. +# +# To get the correct list for manual linking, the simplest way is to set the +# flags to `-verbose`, while on the normal `autolink` mode, then extract them +# from the gcc command-line. +# The Makefile contains a target to automate this: `make detect-libs`. + +case "$1" in + linux) + case $(. /etc/os-release && echo $ID) in + alpine) + COMMON_LIBS="!(static-alpine-clibs) camlstr unix c" + # `m` and `pthread` are built-in musl + echo2 '(-noautolink' + echo2 ' -cclib -Wl,-Bstatic' + echo2 ' -cclib -static-libgcc' + for l in $COMMON_LIBS; do + echo2 " -cclib -l$l" + done + echo2 ' -cclib -static)' + ;; + *) + echo2 "Error: static linking is only supported in Alpine, to avoids glibc constraints (use scripts/static-build.sh to build through an Alpine Docker container)" >&2 + exit 3 + esac + ;; + macosx) + COMMON_LIBS="!(static-macos-clibs) unix" + # `m` and `pthread` are built-in in libSystem + echo2 '(-noautolink' + for l in $COMMON_LIBS; do + if [ "${l%.a}" != "${l}" ]; then echo2 " -cclib $l" + else echo2 " -cclib -l$l" + fi + done + echo2 ')' + ;; + *) + echo "Static linking is not supported for your platform. See $0 to contribute." >&2 + exit 3 +esac diff --git a/src/vscode/vscode-json/package.toml b/src/vscode/vscode-json/package.toml index 912eb2057..30195487b 100644 --- a/src/vscode/vscode-json/package.toml +++ b/src/vscode/vscode-json/package.toml @@ -55,6 +55,7 @@ preprocess = "pps ppx_deriving_encoding" [dependencies] ez_file = "0.3.0" ezjsonm = "" +ppx_deriving_encoding = "0.3.0" # package tools dependencies [tools] diff --git a/src/vscode/vscode-package-json/dune b/src/vscode/vscode-package-json/dune index 5532c35f3..44186b347 100644 --- a/src/vscode/vscode-package-json/dune +++ b/src/vscode/vscode-package-json/dune @@ -8,7 +8,8 @@ (flags (:standard (:include linking.sexp))) ; use field 'dune-stanzas' to add more stanzas here (preprocess (pps ppx_deriving_encoding)) - + (enabled_if (= %{context_name} "default")) + ) ; Use `static-clibs` to specify static C libs (without lib prefix) diff --git a/src/vscode/vscode-package-json/linking_flags.sh b/src/vscode/vscode-package-json/linking_flags.sh index 2e1cb70bb..7fcc1f1c6 100644 --- a/src/vscode/vscode-package-json/linking_flags.sh +++ b/src/vscode/vscode-package-json/linking_flags.sh @@ -1,4 +1,5 @@ #!/bin/sh + set -ue # This script is called by dune to generate the linking flags for static builds @@ -32,12 +33,6 @@ case "$1" in esac shift -case "$1" in - macosx) shift; EXTRA_LIBS="curses $*";; - linux) shift; EXTRA_LIBS="$*";; - --) shift; EXTRA_LIBS="$*";; - *) echo "Not supported %{ocamlc-config:system} '$1'." >&2; help_exit -esac ## Static linking configuration ## @@ -48,18 +43,16 @@ esac # from the gcc command-line. # The Makefile contains a target to automate this: `make detect-libs`. -case $(uname -s) in - Linux) +case "$1" in + linux) case $(. /etc/os-release && echo $ID) in alpine) - # Use `static-alpine-clibs` field to add libs more here - # (or `static-clibs` for both Linux and Macos) - COMMON_LIBS=" camlstr unix c" + COMMON_LIBS="bigstringaf_stubs cstruct_stubs camlstr unix c" # `m` and `pthread` are built-in musl echo2 '(-noautolink' echo2 ' -cclib -Wl,-Bstatic' echo2 ' -cclib -static-libgcc' - for l in $EXTRA_LIBS $COMMON_LIBS; do + for l in $COMMON_LIBS; do echo2 " -cclib -l$l" done echo2 ' -cclib -static)' @@ -69,12 +62,11 @@ case $(uname -s) in exit 3 esac ;; - Darwin) - # Use `static-macos-clibs` field to add libs more here + macosx) COMMON_LIBS=" unix" # `m` and `pthread` are built-in in libSystem echo2 '(-noautolink' - for l in $EXTRA_LIBS $COMMON_LIBS; do + for l in $COMMON_LIBS; do if [ "${l%.a}" != "${l}" ]; then echo2 " -cclib $l" else echo2 " -cclib -l$l" fi diff --git a/src/vscode/vscode-package-json/linking_flags.sh.drom-tpl b/src/vscode/vscode-package-json/linking_flags.sh.drom-tpl new file mode 100644 index 000000000..f7d60d8d2 --- /dev/null +++ b/src/vscode/vscode-package-json/linking_flags.sh.drom-tpl @@ -0,0 +1,79 @@ +#!/bin/sh + +set -ue + +# This script is called by dune to generate the linking flags for static builds +# (on the limited set of supported platforms). It only returns an empty set of +# flags for the default dynamic linking mode. + +LC_ALL=C + +help_exit() { + echo "Usage: $0 descriptiveID dynamic|static linux|macosx [extra-libs]" >&2 + exit 2 +} + +echo2() { + echo "$*" >&2 + echo "$*" +} + +[ $# -lt 3 ] && help_exit + +descID="$1" +shift + +echo2 ";; $descID" +echo2 ";; generated by $0" + +case "$1" in + dynamic) echo2 "()"; exit 0;; + static) ;; + *) echo "Invalid linking mode '$1'." >&2; help_exit +esac + +shift + +## Static linking configuration ## + +# The linked C libraries list may need updating on changes to the dependencies. +# +# To get the correct list for manual linking, the simplest way is to set the +# flags to `-verbose`, while on the normal `autolink` mode, then extract them +# from the gcc command-line. +# The Makefile contains a target to automate this: `make detect-libs`. + +case "$1" in + linux) + case $(. /etc/os-release && echo $ID) in + alpine) + COMMON_LIBS="!(static-alpine-clibs) camlstr unix c" + # `m` and `pthread` are built-in musl + echo2 '(-noautolink' + echo2 ' -cclib -Wl,-Bstatic' + echo2 ' -cclib -static-libgcc' + for l in $COMMON_LIBS; do + echo2 " -cclib -l$l" + done + echo2 ' -cclib -static)' + ;; + *) + echo2 "Error: static linking is only supported in Alpine, to avoids glibc constraints (use scripts/static-build.sh to build through an Alpine Docker container)" >&2 + exit 3 + esac + ;; + macosx) + COMMON_LIBS="!(static-macos-clibs) unix" + # `m` and `pthread` are built-in in libSystem + echo2 '(-noautolink' + for l in $COMMON_LIBS; do + if [ "${l%.a}" != "${l}" ]; then echo2 " -cclib $l" + else echo2 " -cclib -l$l" + fi + done + echo2 ')' + ;; + *) + echo "Static linking is not supported for your platform. See $0 to contribute." >&2 + exit 3 +esac diff --git a/src/vscode/vscode-package-json/package.toml b/src/vscode/vscode-package-json/package.toml index 9c7e42f8a..cb256eff0 100644 --- a/src/vscode/vscode-package-json/package.toml +++ b/src/vscode/vscode-package-json/package.toml @@ -74,3 +74,7 @@ ppx_deriving_encoding = "" # static-clibs = "unix" [fields] dune-flags = ":standard (:include linking.sexp)" +dune-stanzas = """ + (enabled_if (= %{context_name} \"default\")) +""" +static-alpine-clibs = "bigstringaf_stubs cstruct_stubs"