Merge branch 'master' into bump-refmod

OCamlPro · Sep 29, 2023 · 1820440 · 1820440
2 parents 721d7ea + 2bea02c
commit 1820440
Show file tree

Hide file tree

Showing 55 changed files with 1,660 additions and 1,194 deletions.
diff --git a/.drom b/.drom
@@ -5,17 +5,17 @@ version:0.9.0
 
 # hash of toml configuration files
 # used for generation of all files
-817e4b96072d8107ce0332774e85e0a5:.
+b602227bcc8caec31bc7877658492520:.
 # end context for .
 
 # begin context for .github/workflows/workflow.yml
 # file .github/workflows/workflow.yml
-fc10b0887fb072e04e5bcbdd5a0c6668:.github/workflows/workflow.yml
+1ff6f1c9a62d2172393a77d0c39b0347:.github/workflows/workflow.yml
 # end context for .github/workflows/workflow.yml
 
 # begin context for .gitignore
 # file .gitignore
-0727863b8e681aec0cc8d969f8cfb747:.gitignore
+5d7ba25fe849cca450aff51db71881f3:.gitignore
 # end context for .gitignore
 
 # begin context for CHANGES.md
@@ -30,7 +30,7 @@ d00f73c835ae4a1589d55ebda4ab381b:CHANGES.md
 
 # begin context for Makefile
 # file Makefile
-8c1798510e3d14cdfd80b0ebd931773b:Makefile
+720048052459a394dc73cc71e8ad9fdc:Makefile
 # end context for Makefile
 
 # begin context for README.md
@@ -80,8 +80,7 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css
 
 # begin context for dune-project
 # file dune-project
-0331551296e3a627ef039388cc6be5e9:dune-project
-474ade77f279147fb20510c3425249bf:dune-project
+ce7b96b842d3f265df300ce6c72e52d4:dune-project
 # end context for dune-project
 
 # begin context for opam/cobol_ast.opam
@@ -186,7 +185,7 @@ dcf0ebaa8b12787df9efcaa0ce8cbbe5:opam/package-json.opam
 
 # begin context for opam/superbol_free_lib.opam
 # file opam/superbol_free_lib.opam
-8af34e95431d46524a132682225e4c84:opam/superbol_free_lib.opam
+c86beae68d4d0173c716a8449fc2dfaf:opam/superbol_free_lib.opam
 # end context for opam/superbol_free_lib.opam
 
 # begin context for opam/superbol_testutils.opam
@@ -406,7 +405,7 @@ b9a14c96cce8e365e1d7494d078d73fe:src/lsp/superbol-free/linking_flags.sh
 
 # begin context for src/lsp/superbol_free_lib/dune
 # file src/lsp/superbol_free_lib/dune
-6625329103c4f2ffacd92354431cce4e:src/lsp/superbol_free_lib/dune
+562cdec92233a9d9156b6db06c636cde:src/lsp/superbol_free_lib/dune
 # end context for src/lsp/superbol_free_lib/dune
 
 # begin context for src/lsp/superbol_free_lib/version.mlt
@@ -501,7 +500,7 @@ b9a14c96cce8e365e1d7494d078d73fe:src/lsp/superbol-free/linking_flags.sh
 
 # begin context for src/vscode/vscode-json/dune
 # file src/vscode/vscode-json/dune
-452540098fd6ae61c5f364330d4ec493:src/vscode/vscode-json/dune
+c57e4311cc67d76a32541e4dc3132913:src/vscode/vscode-json/dune
 # end context for src/vscode/vscode-json/dune
 
 # begin context for src/vscode/vscode-json/index.mld
@@ -523,18 +522,3 @@ b9a14c96cce8e365e1d7494d078d73fe:src/lsp/superbol-free/linking_flags.sh
 # file src/vscode/vscode-languageclient-js-stubs/version.mlt
 940d29cde7f16cd0916ed1d5f9c41154:src/vscode/vscode-languageclient-js-stubs/version.mlt
 # end context for src/vscode/vscode-languageclient-js-stubs/version.mlt
-
-# begin context for src/vscode/vscode-package-json/dune
-# file 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
-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
-# file src/vscode/vscode-package-json/version.mlt
-940d29cde7f16cd0916ed1d5f9c41154:src/vscode/vscode-package-json/version.mlt
-# end context for src/vscode/vscode-package-json/version.mlt
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -61,7 +61,7 @@ jobs:
 
       - run: opam pin add . -y --no-action
 
-      - run: opam depext -y superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_ast cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils
+      - run: opam depext -y superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_ast cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils
 #        if: steps.cache-opam.outputs.cache-hit != 'true'
 
       - run: opam install -y opam/*.opam --deps-only --with-test

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 /node-js-stubs
 /vscode-js-stubs
 /vscode-languageclient-js-stubs
-/vscode-package-json
 /vscode-json
 /vscode-debugadapter
 /vscode-debugprotocol

diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ all: build
 build:
 	./scripts/before.sh build
 	opam exec -- dune build @install
-	./scripts/copy-bin.sh superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_ast cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils
+	./scripts/copy-bin.sh superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_ast cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils
 	./scripts/after.sh build
 
 build-deps:

diff --git a/Makefile.header b/Makefile.header
@@ -1,14 +1,18 @@
 # -*- Makefile -*-
 PROJECT=superbol_vscode_platform
 SRCDIR=src/vscode/superbol-vscode-platform
+CP ?= cp -f
 
 # Emacs lsp-mode source directory (https://github.com/emacs-lsp/lsp-mode):
 # (could be a submodule)
 LSP_MODE_SRCDIR ?= ../lsp-mode
 
+all: superbol-free
+superbol-free: build
+	$(CP) _build/default/src/lsp/superbol-free/main.exe superbol-free
+
 .PHONY: compile
 compile: build
-	cp -f _build/default/src/vscode/vscode-package-json/main.exe vscode-package-json
 	yarn esbuild _build/default/$(SRCDIR)/$(PROJECT).bc.js \
                 --bundle \
                 --external:vscode \
@@ -32,6 +36,11 @@ compile-release:
                 --sourcemap \
                 --sources-content=false
 
+.PHONY: clean-execs
+distclean: clean-execs
+clean-execs:
+	rm -f superbol-free vscode-package-json
+
 .PHONY: opam-cross
 
 opam-cross:

diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
+[![Actions Status](https://github.com/ocamlpro/superbol-studio-oss/workflows/Main%20Workflow/badge.svg)](https://github.com/ocamlpro/superbol-studio-oss/actions)
+[![Release](https://img.shields.io/github/release/ocamlpro/superbol-studio-oss.svg)](https://github.com/ocamlpro/superbol-studio-oss/releases)
+
 # Superbol Studio OSS: A New Platform for COBOL
 
 ## Features

diff --git a/drom.toml b/drom.toml
@@ -122,10 +122,6 @@ dir = "src/vscode/vscode-js-stubs"
 dir = "src/vscode/vscode-languageclient-js-stubs"
 # edit 'src/vscode/vscode-languageclient-js-stubs/package.toml' for package-specific options
 
-[[package]]
-dir = "src/vscode/vscode-package-json"
-# edit 'src/vscode/vscode-package-json/package.toml' for package-specific options
-
 [[package]]
 dir = "src/vscode/vscode-json"
 # edit 'src/vscode/vscode-json/package.toml' for package-specific options

diff --git a/dune-project b/dune-project
@@ -125,23 +125,6 @@
   )
  )
 
-(package
- (name vscode-package-json)
- (synopsis "The superbol-studio-oss project")
- (description "This is the description\nof the superbol-studio-oss OCaml project\n")
- (depends
-   (ocaml (>= 4.14.0))
-   (vscode-json (= version))
-   ezjsonm
-   (ez_file (and (>= 0.3.0) (< 1.0.0)))
-   ppx_deriving_encoding
-   ppx_inline_test
-   ppx_expect
-   odoc
-   ocamlformat
-  )
- )
-
 (package
  (name vscode-json)
  (synopsis "The superbol-studio-oss project")
@@ -219,6 +202,7 @@
  (description "This is the description\nof the superbol-studio-oss OCaml project\n")
  (depends
    (ocaml (>= 4.14.0))
+   (vscode-json (= version))
    (ez_file ( >= 0.3 ))
    (ez_cmdliner (and (>= 0.3.0) (< 1.0.0)))
    (cobol_typeck (= version))

diff --git a/opam/osx/superbol_free_lib-osx.opam b/opam/osx/superbol_free_lib-osx.opam
@@ -50,6 +50,7 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
+  "vscode-json-osx" {= version}
   "ez_file-osx" {>= "0.3"}
   "ez_cmdliner-osx" {>= "0.3.0" & < "1.0.0"}
   "cobol_typeck-osx" {= version}

diff --git a/opam/osx/vscode-package-json-osx.opam b/opam/osx/vscode-package-json-osx.opam
diff --git a/opam/superbol_free_lib.opam b/opam/superbol_free_lib.opam
@@ -48,6 +48,7 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
+  "vscode-json" {= version}
   "ez_file" {>= "0.3"}
   "ez_cmdliner" {>= "0.3.0" & < "1.0.0"}
   "cobol_typeck" {= version}

diff --git a/opam/vscode-package-json.opam b/opam/vscode-package-json.opam
diff --git a/opam/windows/superbol_free_lib-windows.opam b/opam/windows/superbol_free_lib-windows.opam
@@ -50,6 +50,7 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
+  "vscode-json-windows" {= version}
   "ez_file-windows" {>= "0.3"}
   "ez_cmdliner-windows" {>= "0.3.0" & < "1.0.0"}
   "cobol_typeck-windows" {= version}