From 077f9f9a4a2fd9416a4f37c52eef92c791452237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= Date: Fri, 27 Oct 2023 13:56:17 +0200 Subject: [PATCH] Included a js_of_ocaml version of superbol in the .vsix This is a first step towards fixing #76 (but does not entirely fixes it). It avoids the need to install an external superbol executable, and should work on all platforms. The bundled superbol-free.bc.js is used if the option `superbol.path` is set to `null`, which is the new default. Some performance investigation is needed -- if we find out that the js_of_ocaml version is too slow for practical use, we can make this not be the default. --- .drom | 64 +++++++++---------- src/lsp/cobol_cfg/version.mlt | 9 +-- src/lsp/cobol_common/version.mlt | 9 +-- src/lsp/cobol_config/version.mlt | 9 +-- src/lsp/cobol_data/version.mlt | 9 +-- src/lsp/cobol_indent/version.mlt | 9 +-- src/lsp/cobol_indent_old/version.mlt | 9 +-- src/lsp/cobol_lsp/version.mlt | 9 +-- src/lsp/cobol_parser/version.mlt | 9 +-- src/lsp/cobol_preproc/version.mlt | 9 +-- src/lsp/cobol_ptree/version.mlt | 9 +-- src/lsp/cobol_typeck/version.mlt | 9 +-- src/lsp/cobol_unit/version.mlt | 9 +-- src/lsp/ebcdic_lib/ebcdic_version.mlt | 9 +-- src/lsp/ezr_toml/version.mlt | 9 +-- src/lsp/ppx_cobcflags/version.mlt | 9 +-- src/lsp/pretty/version.mlt | 9 +-- src/lsp/sql_ast/version.mlt | 9 +-- src/lsp/sql_parser/version.mlt | 9 +-- src/lsp/superbol_free_lib/version.mlt | 9 +-- src/lsp/superbol_preprocs/version.mlt | 9 +-- src/lsp/superbol_project/version.mlt | 9 +-- src/vendor/ez_toml/dune | 2 +- src/vendor/ez_toml/version.mlt | 9 +-- .../src-bindings/interop/version.mlt | 9 +-- .../src-bindings/node/version.mlt | 9 +-- .../src-bindings/polka/version.mlt | 9 +-- .../src-bindings/vscode/version.mlt | 9 +-- .../vscode_languageclient/version.mlt | 9 +-- .../superbol-vscode-platform/version.mlt | 9 +-- src/vscode/vscode-debugadapter/version.mlt | 9 +-- src/vscode/vscode-debugprotocol/version.mlt | 9 +-- src/vscode/vscode-json/version.mlt | 9 +-- 33 files changed, 95 insertions(+), 250 deletions(-) diff --git a/.drom b/.drom index d5bb24fa8..aea4ca6a4 100644 --- a/.drom +++ b/.drom @@ -295,7 +295,7 @@ c6c7cd50f0ebff63bab991bf9a1633e6:src/lsp/cobol_cfg/dune # begin context for src/lsp/cobol_cfg/version.mlt # file src/lsp/cobol_cfg/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_cfg/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_cfg/version.mlt # end context for src/lsp/cobol_cfg/version.mlt # begin context for src/lsp/cobol_common/dune @@ -305,7 +305,7 @@ c6c7cd50f0ebff63bab991bf9a1633e6:src/lsp/cobol_cfg/dune # begin context for src/lsp/cobol_common/version.mlt # file src/lsp/cobol_common/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_common/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_common/version.mlt # end context for src/lsp/cobol_common/version.mlt # begin context for src/lsp/cobol_config/dune @@ -315,7 +315,7 @@ c6c7cd50f0ebff63bab991bf9a1633e6:src/lsp/cobol_cfg/dune # begin context for src/lsp/cobol_config/version.mlt # file src/lsp/cobol_config/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_config/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_config/version.mlt # end context for src/lsp/cobol_config/version.mlt # begin context for src/lsp/cobol_data/dune @@ -325,7 +325,7 @@ c6c7cd50f0ebff63bab991bf9a1633e6:src/lsp/cobol_cfg/dune # begin context for src/lsp/cobol_data/version.mlt # file src/lsp/cobol_data/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_data/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_data/version.mlt # end context for src/lsp/cobol_data/version.mlt # begin context for src/lsp/cobol_indent/dune @@ -335,7 +335,7 @@ c6c7cd50f0ebff63bab991bf9a1633e6:src/lsp/cobol_cfg/dune # begin context for src/lsp/cobol_indent/version.mlt # file src/lsp/cobol_indent/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_indent/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_indent/version.mlt # end context for src/lsp/cobol_indent/version.mlt # begin context for src/lsp/cobol_indent_old/dune @@ -345,7 +345,7 @@ a98a08d36a2f65127f60832515b6ab47:src/lsp/cobol_indent_old/dune # begin context for src/lsp/cobol_indent_old/version.mlt # file src/lsp/cobol_indent_old/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_indent_old/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_indent_old/version.mlt # end context for src/lsp/cobol_indent_old/version.mlt # begin context for src/lsp/cobol_lsp/dune @@ -355,7 +355,7 @@ a98a08d36a2f65127f60832515b6ab47:src/lsp/cobol_indent_old/dune # begin context for src/lsp/cobol_lsp/version.mlt # file src/lsp/cobol_lsp/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_lsp/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_lsp/version.mlt # end context for src/lsp/cobol_lsp/version.mlt # begin context for src/lsp/cobol_parser/dune @@ -365,7 +365,7 @@ a98a08d36a2f65127f60832515b6ab47:src/lsp/cobol_indent_old/dune # begin context for src/lsp/cobol_parser/version.mlt # file src/lsp/cobol_parser/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_parser/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_parser/version.mlt # end context for src/lsp/cobol_parser/version.mlt # begin context for src/lsp/cobol_preproc/dune @@ -375,7 +375,7 @@ e31b22f1d241d75db90f170f9c6fd95d:src/lsp/cobol_preproc/dune # begin context for src/lsp/cobol_preproc/version.mlt # file src/lsp/cobol_preproc/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_preproc/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_preproc/version.mlt # end context for src/lsp/cobol_preproc/version.mlt # begin context for src/lsp/cobol_ptree/dune @@ -385,7 +385,7 @@ e31b22f1d241d75db90f170f9c6fd95d:src/lsp/cobol_preproc/dune # begin context for src/lsp/cobol_ptree/version.mlt # file src/lsp/cobol_ptree/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_ptree/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_ptree/version.mlt # end context for src/lsp/cobol_ptree/version.mlt # begin context for src/lsp/cobol_typeck/dune @@ -395,7 +395,7 @@ ef30db283bff57bd7bfea9b29e9178fd:src/lsp/cobol_typeck/dune # begin context for src/lsp/cobol_typeck/version.mlt # file src/lsp/cobol_typeck/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_typeck/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_typeck/version.mlt # end context for src/lsp/cobol_typeck/version.mlt # begin context for src/lsp/cobol_unit/dune @@ -405,7 +405,7 @@ d2c167a61ac9aa89964577228ccb49fa:src/lsp/cobol_unit/dune # begin context for src/lsp/cobol_unit/version.mlt # file src/lsp/cobol_unit/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/cobol_unit/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/cobol_unit/version.mlt # end context for src/lsp/cobol_unit/version.mlt # begin context for src/lsp/ebcdic_lib/dune @@ -415,7 +415,7 @@ d2c167a61ac9aa89964577228ccb49fa:src/lsp/cobol_unit/dune # begin context for src/lsp/ebcdic_lib/ebcdic_version.mlt # file src/lsp/ebcdic_lib/ebcdic_version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/ebcdic_lib/ebcdic_version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/ebcdic_lib/ebcdic_version.mlt # end context for src/lsp/ebcdic_lib/ebcdic_version.mlt # begin context for src/lsp/ezr_toml/dune @@ -425,7 +425,7 @@ eab335ce600887c59f1baf9b0983d0ac:src/lsp/ezr_toml/dune # begin context for src/lsp/ezr_toml/version.mlt # file src/lsp/ezr_toml/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/ezr_toml/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/ezr_toml/version.mlt # end context for src/lsp/ezr_toml/version.mlt # begin context for src/lsp/ppx_cobcflags/dune @@ -435,7 +435,7 @@ eab335ce600887c59f1baf9b0983d0ac:src/lsp/ezr_toml/dune # begin context for src/lsp/ppx_cobcflags/version.mlt # file src/lsp/ppx_cobcflags/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/ppx_cobcflags/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/ppx_cobcflags/version.mlt # end context for src/lsp/ppx_cobcflags/version.mlt # begin context for src/lsp/pretty/dune @@ -445,7 +445,7 @@ eab335ce600887c59f1baf9b0983d0ac:src/lsp/ezr_toml/dune # begin context for src/lsp/pretty/version.mlt # file src/lsp/pretty/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/pretty/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/pretty/version.mlt # end context for src/lsp/pretty/version.mlt # begin context for src/lsp/sql_ast/dune @@ -455,7 +455,7 @@ e0c73ea039315b0cfa5b4a7ac54a1484:src/lsp/sql_ast/dune # begin context for src/lsp/sql_ast/version.mlt # file src/lsp/sql_ast/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/sql_ast/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/sql_ast/version.mlt # end context for src/lsp/sql_ast/version.mlt # begin context for src/lsp/sql_parser/dune @@ -465,7 +465,7 @@ c222bcf238c7b0cd7c910fc5ec8e2dcd:src/lsp/sql_parser/dune # begin context for src/lsp/sql_parser/version.mlt # file src/lsp/sql_parser/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/sql_parser/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/sql_parser/version.mlt # end context for src/lsp/sql_parser/version.mlt # begin context for src/lsp/superbol-free/dune @@ -485,7 +485,7 @@ a8a051709a43fba5b6ab54b66b77cbcf:src/lsp/superbol_free_lib/dune # begin context for src/lsp/superbol_free_lib/version.mlt # file src/lsp/superbol_free_lib/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/superbol_free_lib/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/superbol_free_lib/version.mlt # end context for src/lsp/superbol_free_lib/version.mlt # begin context for src/lsp/superbol_preprocs/dune @@ -495,7 +495,7 @@ a8a051709a43fba5b6ab54b66b77cbcf:src/lsp/superbol_free_lib/dune # begin context for src/lsp/superbol_preprocs/version.mlt # file src/lsp/superbol_preprocs/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/superbol_preprocs/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/superbol_preprocs/version.mlt # end context for src/lsp/superbol_preprocs/version.mlt # begin context for src/lsp/superbol_project/dune @@ -505,7 +505,7 @@ a7e1e69bff3d4c180af5f42cce7f6764:src/lsp/superbol_project/dune # begin context for src/lsp/superbol_project/version.mlt # file src/lsp/superbol_project/version.mlt -3b5d23165644aee0c651353e188a647f:src/lsp/superbol_project/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/lsp/superbol_project/version.mlt # end context for src/lsp/superbol_project/version.mlt # begin context for src/superbol-studio-oss/dune @@ -520,7 +520,7 @@ b3a1a4662424391d83d94daf0c79756b:src/superbol-studio-oss/dune # begin context for src/vendor/ez_toml/dune # file src/vendor/ez_toml/dune -87fe96c228b8cb51be7268c7e3cdd5b5:src/vendor/ez_toml/dune +aad8ac8a26ae15e3501dd5ea3b49ec9a:src/vendor/ez_toml/dune # end context for src/vendor/ez_toml/dune # begin context for src/vendor/ez_toml/index.mld @@ -530,7 +530,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vendor/ez_toml/version.mlt # file src/vendor/ez_toml/version.mlt -3b5d23165644aee0c651353e188a647f:src/vendor/ez_toml/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vendor/ez_toml/version.mlt # end context for src/vendor/ez_toml/version.mlt # begin context for src/vendor/vscode-ocaml-platform/src-bindings/interop/dune @@ -540,7 +540,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt # file src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt -3b5d23165644aee0c651353e188a647f:src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt # end context for src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt # begin context for src/vendor/vscode-ocaml-platform/src-bindings/node/dune @@ -550,7 +550,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt # file src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt -3b5d23165644aee0c651353e188a647f:src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt # end context for src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt # begin context for src/vendor/vscode-ocaml-platform/src-bindings/polka/dune @@ -560,7 +560,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt # file src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt -3b5d23165644aee0c651353e188a647f:src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt # end context for src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt # begin context for src/vendor/vscode-ocaml-platform/src-bindings/vscode/dune @@ -570,7 +570,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt # file src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt -3b5d23165644aee0c651353e188a647f:src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt # end context for src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt # begin context for src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/dune @@ -580,7 +580,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt # file src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt -3b5d23165644aee0c651353e188a647f:src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt # end context for src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt # begin context for src/vscode/superbol-vscode-platform/dune @@ -590,7 +590,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vscode/superbol-vscode-platform/version.mlt # file src/vscode/superbol-vscode-platform/version.mlt -3b5d23165644aee0c651353e188a647f:src/vscode/superbol-vscode-platform/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vscode/superbol-vscode-platform/version.mlt # end context for src/vscode/superbol-vscode-platform/version.mlt # begin context for src/vscode/vscode-debugadapter/dune @@ -600,7 +600,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vscode/vscode-debugadapter/version.mlt # file src/vscode/vscode-debugadapter/version.mlt -3b5d23165644aee0c651353e188a647f:src/vscode/vscode-debugadapter/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vscode/vscode-debugadapter/version.mlt # end context for src/vscode/vscode-debugadapter/version.mlt # begin context for src/vscode/vscode-debugprotocol/dune @@ -610,7 +610,7 @@ c5cd7b2d0a3de0d33ec14e3d433c1cae:src/vendor/ez_toml/index.mld # begin context for src/vscode/vscode-debugprotocol/version.mlt # file src/vscode/vscode-debugprotocol/version.mlt -3b5d23165644aee0c651353e188a647f:src/vscode/vscode-debugprotocol/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vscode/vscode-debugprotocol/version.mlt # end context for src/vscode/vscode-debugprotocol/version.mlt # begin context for src/vscode/vscode-json/dune @@ -625,5 +625,5 @@ c57e4311cc67d76a32541e4dc3132913:src/vscode/vscode-json/dune # begin context for src/vscode/vscode-json/version.mlt # file src/vscode/vscode-json/version.mlt -3b5d23165644aee0c651353e188a647f:src/vscode/vscode-json/version.mlt +2209e9f7d474e5ee3c3408010170c572:src/vscode/vscode-json/version.mlt # end context for src/vscode/vscode-json/version.mlt diff --git a/src/lsp/cobol_cfg/version.mlt b/src/lsp/cobol_cfg/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_cfg/version.mlt +++ b/src/lsp/cobol_cfg/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_common/version.mlt b/src/lsp/cobol_common/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_common/version.mlt +++ b/src/lsp/cobol_common/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_config/version.mlt b/src/lsp/cobol_config/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_config/version.mlt +++ b/src/lsp/cobol_config/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_data/version.mlt b/src/lsp/cobol_data/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_data/version.mlt +++ b/src/lsp/cobol_data/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_indent/version.mlt b/src/lsp/cobol_indent/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_indent/version.mlt +++ b/src/lsp/cobol_indent/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_indent_old/version.mlt b/src/lsp/cobol_indent_old/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_indent_old/version.mlt +++ b/src/lsp/cobol_indent_old/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_lsp/version.mlt b/src/lsp/cobol_lsp/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_lsp/version.mlt +++ b/src/lsp/cobol_lsp/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_parser/version.mlt b/src/lsp/cobol_parser/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_parser/version.mlt +++ b/src/lsp/cobol_parser/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_preproc/version.mlt b/src/lsp/cobol_preproc/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_preproc/version.mlt +++ b/src/lsp/cobol_preproc/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_ptree/version.mlt b/src/lsp/cobol_ptree/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_ptree/version.mlt +++ b/src/lsp/cobol_ptree/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_typeck/version.mlt b/src/lsp/cobol_typeck/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_typeck/version.mlt +++ b/src/lsp/cobol_typeck/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/cobol_unit/version.mlt b/src/lsp/cobol_unit/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/cobol_unit/version.mlt +++ b/src/lsp/cobol_unit/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/ebcdic_lib/ebcdic_version.mlt b/src/lsp/ebcdic_lib/ebcdic_version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/ebcdic_lib/ebcdic_version.mlt +++ b/src/lsp/ebcdic_lib/ebcdic_version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/ezr_toml/version.mlt b/src/lsp/ezr_toml/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/ezr_toml/version.mlt +++ b/src/lsp/ezr_toml/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/ppx_cobcflags/version.mlt b/src/lsp/ppx_cobcflags/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/ppx_cobcflags/version.mlt +++ b/src/lsp/ppx_cobcflags/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/pretty/version.mlt b/src/lsp/pretty/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/pretty/version.mlt +++ b/src/lsp/pretty/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/sql_ast/version.mlt b/src/lsp/sql_ast/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/sql_ast/version.mlt +++ b/src/lsp/sql_ast/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/sql_parser/version.mlt b/src/lsp/sql_parser/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/sql_parser/version.mlt +++ b/src/lsp/sql_parser/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/superbol_free_lib/version.mlt b/src/lsp/superbol_free_lib/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/superbol_free_lib/version.mlt +++ b/src/lsp/superbol_free_lib/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/superbol_preprocs/version.mlt b/src/lsp/superbol_preprocs/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/superbol_preprocs/version.mlt +++ b/src/lsp/superbol_preprocs/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/lsp/superbol_project/version.mlt b/src/lsp/superbol_project/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/lsp/superbol_project/version.mlt +++ b/src/lsp/superbol_project/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vendor/ez_toml/dune b/src/vendor/ez_toml/dune index d5ace455e..ae93cc418 100644 --- a/src/vendor/ez_toml/dune +++ b/src/vendor/ez_toml/dune @@ -13,8 +13,8 @@ ) -(menhir (modules internal_parser)) (ocamllex internal_lexer) +(menhir (modules internal_parser)) (rule (targets version.ml) diff --git a/src/vendor/ez_toml/version.mlt b/src/vendor/ez_toml/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vendor/ez_toml/version.mlt +++ b/src/vendor/ez_toml/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt b/src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt +++ b/src/vendor/vscode-ocaml-platform/src-bindings/interop/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt b/src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt +++ b/src/vendor/vscode-ocaml-platform/src-bindings/node/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt b/src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt +++ b/src/vendor/vscode-ocaml-platform/src-bindings/polka/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt b/src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt +++ b/src/vendor/vscode-ocaml-platform/src-bindings/vscode/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt b/src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt +++ b/src/vendor/vscode-ocaml-platform/src-bindings/vscode_languageclient/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vscode/superbol-vscode-platform/version.mlt b/src/vscode/superbol-vscode-platform/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vscode/superbol-vscode-platform/version.mlt +++ b/src/vscode/superbol-vscode-platform/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vscode/vscode-debugadapter/version.mlt b/src/vscode/vscode-debugadapter/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vscode/vscode-debugadapter/version.mlt +++ b/src/vscode/vscode-debugadapter/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vscode/vscode-debugprotocol/version.mlt b/src/vscode/vscode-debugprotocol/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vscode/vscode-debugprotocol/version.mlt +++ b/src/vscode/vscode-debugprotocol/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function diff --git a/src/vscode/vscode-json/version.mlt b/src/vscode/vscode-json/version.mlt index b6d1db7ca..c608b449d 100644 --- a/src/vscode/vscode-json/version.mlt +++ b/src/vscode/vscode-json/version.mlt @@ -11,13 +11,8 @@ let query cmd = else None with End_of_file -> None -let gitdir = - try Sys.getenv "DUNE_SOURCEROOT" with Not_found -> "" - -let commit_hash = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%H") -let commit_date = - query ("git -C \""^gitdir^"\" show -s --pretty=format:%ci") +let commit_hash = query "git show -s --pretty=format:%H" +let commit_date = query "git show -s --pretty=format:%ci" let version = "0.1.5" let string_option = function