Merge pull request #69 from nberth/superbol-project

New `superbol_project` library, with cleanup of `cobol_config`
OCamlPro · Oct 30, 2023 · 0878ae3 · 0878ae3
2 parents f25f915 + f1962eb
commit 0878ae3
Show file tree

Hide file tree

Showing 81 changed files with 2,198 additions and 1,119 deletions.
diff --git a/.drom b/.drom
@@ -5,12 +5,12 @@ version:0.9.0
 
 # hash of toml configuration files
 # used for generation of all files
-33600fe888d71659a58729dcf2aa5517:.
+3b1faf25344f4faae93ba95094d29269:.
 # end context for .
 
 # begin context for .github/workflows/workflow.yml
 # file .github/workflows/workflow.yml
-b7db68ba8c2b15770e98cd2a39a55e6e:.github/workflows/workflow.yml
+8244d5e95f1739a2a8481679cdb7f06f:.github/workflows/workflow.yml
 # end context for .github/workflows/workflow.yml
 
 # begin context for .gitignore
@@ -30,7 +30,7 @@ d00f73c835ae4a1589d55ebda4ab381b:CHANGES.md
 
 # begin context for Makefile
 # file Makefile
-d05b62828065b955ff16647e189d02b1:Makefile
+d71d6060ee4fa0a89488a6d4c0178158:Makefile
 # end context for Makefile
 
 # begin context for README.md
@@ -80,7 +80,7 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css
 
 # begin context for dune-project
 # file dune-project
-b8e5b29ae669482824c6b8cd2ff4fc9c:dune-project
+de3add436687f5413eb9cb4563b6e570:dune-project
 # end context for dune-project
 
 # begin context for opam/cobol_ast.opam
@@ -110,7 +110,7 @@ cf7dc739a839b17b205c2a21dd75e19e:opam/cobol_config.opam
 
 # begin context for opam/cobol_lsp.opam
 # file opam/cobol_lsp.opam
-b59079469702b9b3c76559bff3e8d8d6:opam/cobol_lsp.opam
+15d7c56ea22baa4efa6ef1610c4480af:opam/cobol_lsp.opam
 # end context for opam/cobol_lsp.opam
 
 # begin context for opam/cobol_parser.opam
@@ -143,6 +143,11 @@ b59079469702b9b3c76559bff3e8d8d6:opam/cobol_lsp.opam
 f7f42a209d8b673bda5d0b5d05f3de09:opam/ez_toml.opam
 # end context for opam/ez_toml.opam
 
+# begin context for opam/ezr_toml.opam
+# file opam/ezr_toml.opam
+9455276280a2fb6d3aaa6425b401a419:opam/ezr_toml.opam
+# end context for opam/ezr_toml.opam
+
 # begin context for opam/interop-js-stubs.opam
 # file opam/interop-js-stubs.opam
 d224826f8f433f8b0d53d83519693365:opam/interop-js-stubs.opam
@@ -198,6 +203,11 @@ f9c97969426e6671533692d2acc51dfe:opam/pretty.opam
 b815611835e260ddcc4e14f317852cc4:opam/superbol_free_lib.opam
 # end context for opam/superbol_free_lib.opam
 
+# begin context for opam/superbol_project.opam
+# file opam/superbol_project.opam
+da41008cb67ac8b63775b400ddd70dcd:opam/superbol_project.opam
+# end context for opam/superbol_project.opam
+
 # begin context for opam/superbol_testutils.opam
 # file opam/superbol_testutils.opam
 2d37993028fb9a9ee9e859fed52a0dee:opam/superbol_testutils.opam
@@ -320,7 +330,7 @@ c830729656f586961a44188b55cb4ac6:src/lsp/cobol_data/dune
 
 # begin context for src/lsp/cobol_lsp/dune
 # file src/lsp/cobol_lsp/dune
-957f078deb602f8e0114c8abcc771abf:src/lsp/cobol_lsp/dune
+4327949d1aed57b3e3aa5ee51a29c968:src/lsp/cobol_lsp/dune
 # end context for src/lsp/cobol_lsp/dune
 
 # begin context for src/lsp/cobol_lsp/version.mlt
@@ -378,6 +388,16 @@ aa698eb4d08863a11b6193190a5d5319:src/lsp/cobol_typeck/dune
 940d29cde7f16cd0916ed1d5f9c41154: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
+# file src/lsp/ezr_toml/dune
+eab335ce600887c59f1baf9b0983d0ac:src/lsp/ezr_toml/dune
+# end context for src/lsp/ezr_toml/dune
+
+# begin context for src/lsp/ezr_toml/version.mlt
+# file src/lsp/ezr_toml/version.mlt
+940d29cde7f16cd0916ed1d5f9c41154:src/lsp/ezr_toml/version.mlt
+# end context for src/lsp/ezr_toml/version.mlt
+
 # begin context for src/lsp/ppx_cobcflags/dune
 # file src/lsp/ppx_cobcflags/dune
 86758f07c1c4f6bef04e0520a41cb8f6:src/lsp/ppx_cobcflags/dune
@@ -418,6 +438,16 @@ ffef64c84976f7655b4dd57e795d7097:src/lsp/superbol_free_lib/dune
 940d29cde7f16cd0916ed1d5f9c41154:src/lsp/superbol_free_lib/version.mlt
 # end context for src/lsp/superbol_free_lib/version.mlt
 
+# begin context for src/lsp/superbol_project/dune
+# file src/lsp/superbol_project/dune
+4f0eb93049700d37bb60c5fc13d155a3:src/lsp/superbol_project/dune
+# end context for src/lsp/superbol_project/dune
+
+# begin context for src/lsp/superbol_project/version.mlt
+# file src/lsp/superbol_project/version.mlt
+940d29cde7f16cd0916ed1d5f9c41154:src/lsp/superbol_project/version.mlt
+# end context for src/lsp/superbol_project/version.mlt
+
 # begin context for src/testing/superbol_testutils/dune
 # file src/testing/superbol_testutils/dune
 0da5d475bb1c2675efbab0a833620514:src/testing/superbol_testutils/dune

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-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils ez_toml
+      - 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 superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils ez_toml ezr_toml
 #        if: steps.cache-opam.outputs.cache-hit != 'true'
 
       - run: opam install -y opam/*.opam --deps-only --with-test

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-json vscode-debugadapter vscode-debugprotocol superbol-free superbol_free_lib cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils ez_toml
+	./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 superbol_project cobol_common cobol_parser cobol_ptree ebcdic_lib cobol_lsp ppx_cobcflags pretty cobol_config cobol_indent cobol_preproc cobol_data cobol_typeck superbol_testutils ez_toml ezr_toml
 	./scripts/after.sh build
 
 build-deps:

diff --git a/drom.toml b/drom.toml
@@ -146,6 +146,10 @@ dir = "src/lsp/superbol-free"
 dir = "src/lsp/superbol_free_lib"
 # edit 'src/lsp/superbol_lib/package.toml' for package-specific options
 
+[[package]]
+dir = "src/lsp/superbol_project"
+# edit 'src/lsp/superbol_project/package.toml' for package-specific options
+
 [[package]]
 dir = "src/lsp/cobol_common"
 # edit 'src/lsp/cobol_common/package.toml' for package-specific options
@@ -201,3 +205,7 @@ dir = "src/testing/superbol_testutils"
 [[package]]
 dir = "src/vendor/ez_toml"
 # edit 'src/testing/superbol_testutils/package.toml' for package-specific options
+
+[[package]]
+dir = "src/lsp/ezr_toml"
+# edit 'src/lsp/ezr_toml/package.toml' for package-specific options
diff --git a/dune-project b/dune-project
@@ -219,6 +219,25 @@
   )
  )
 
+(package
+ (name superbol_project)
+ (synopsis "The superbol-studio-oss project")
+ (description "This is the description\nof the superbol-studio-oss OCaml project\n")
+ (depends
+   (ocaml (>= 4.14.0))
+   (pretty (= version))
+   (ocplib_stuff (and (>= 0.4.0) (< 1.0.0)))
+   (ezr_toml (= version))
+   (ez_file (and (>= 0.3.0) (< 1.0.0)))
+   (cobol_config (= version))
+   (cobol_common (= version))
+   (ppx_inline_test ( >= v0.16.1 ))
+   ppx_expect
+   odoc
+   ocamlformat
+  )
+ )
+
 (package
  (name cobol_common)
  (synopsis "The superbol-studio-oss project")
@@ -291,6 +310,7 @@
  (depends
    (ocaml (>= 4.14.0))
    (toml (and (>= 7.1.0) (< 8.0.0)))
+   (superbol_project (= version))
    (pretty (= version))
    (lsp (and ( >= 1.15 )( < 1.16 )))
    (jsonrpc ( >= 1.15 ))
@@ -455,4 +475,21 @@
   )
  )
 
+(package
+ (name ezr_toml)
+ (synopsis "The superbol-studio-oss project")
+ (description "This is the description\nof the superbol-studio-oss OCaml project\n")
+ (depends
+   (ocaml (>= 4.14.0))
+   (pretty (= version))
+   (ocplib_stuff (and (>= 0.4.0) (< 1.0.0)))
+   (ez_toml (= version))
+   (ez_file (and (>= 0.3.0) (< 1.0.0)))
+   (ppx_inline_test ( >= v0.16.1 ))
+   ppx_expect
+   odoc
+   ocamlformat
+  )
+ )
+
 
diff --git a/opam/cobol_lsp.opam b/opam/cobol_lsp.opam
@@ -49,6 +49,7 @@ depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
   "toml" {>= "7.1.0" & < "8.0.0"}
+  "superbol_project" {= version}
   "pretty" {= version}
   "lsp" {>= "1.15" & < "1.16"}
   "jsonrpc" {>= "1.15"}

diff --git a/opam/ezr_toml.opam b/opam/ezr_toml.opam
@@ -0,0 +1,60 @@
+# 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: "ezr_toml"
+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 <nicolas.berthier@ocamlpro.com>"
+  "David Declerck <david.declerck@ocamlpro.com>"
+  "Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
+  "Emilien Lemaire <emilien.lemaire@ocamlpro.com>"
+]
+maintainer: [
+  "Nicolas Berthier <nicolas.berthier@ocamlpro.com>"
+  "David Declerck <david.declerck@ocamlpro.com>"
+  "Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
+  "Emilien Lemaire <emilien.lemaire@ocamlpro.com>"
+]
+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"
+    name
+    "-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"}
+  "pretty" {= version}
+  "ocplib_stuff" {>= "0.4.0" & < "1.0.0"}
+  "ez_toml" {= version}
+  "ez_file" {>= "0.3.0" & < "1.0.0"}
+  "ppx_inline_test" {>= "v0.16.1" with-test}
+  "ppx_expect" {with-test}
+  "odoc" {with-doc}
+  "ocamlformat" {with-test}
+]
+# Content of `opam-trailer` field:
diff --git a/opam/superbol_project.opam b/opam/superbol_project.opam
@@ -0,0 +1,62 @@
+# 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_project"
+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 <nicolas.berthier@ocamlpro.com>"
+  "David Declerck <david.declerck@ocamlpro.com>"
+  "Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
+  "Emilien Lemaire <emilien.lemaire@ocamlpro.com>"
+]
+maintainer: [
+  "Nicolas Berthier <nicolas.berthier@ocamlpro.com>"
+  "David Declerck <david.declerck@ocamlpro.com>"
+  "Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>"
+  "Emilien Lemaire <emilien.lemaire@ocamlpro.com>"
+]
+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"
+    name
+    "-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"}
+  "pretty" {= version}
+  "ocplib_stuff" {>= "0.4.0" & < "1.0.0"}
+  "ezr_toml" {= version}
+  "ez_file" {>= "0.3.0" & < "1.0.0"}
+  "cobol_config" {= version}
+  "cobol_common" {= version}
+  "ppx_inline_test" {>= "v0.16.1" with-test}
+  "ppx_expect" {with-test}
+  "odoc" {with-doc}
+  "ocamlformat" {with-test}
+]
+# Content of `opam-trailer` field:
diff --git a/package.json b/package.json
@@ -160,13 +160,21 @@
               "cobol2002",
               "cobol2014",
               "acu",
+              "acu-strict",
               "bs2000",
+              "bs2000-strict",
               "gcos",
+              "gcos-strict",
               "ibm",
+              "ibm-strict",
               "mf",
+              "mf-strict",
               "mvs",
+              "mvs-strict",
               "realia",
+              "realia-strict",
               "rm",
+              "rm-strict",
               "xopen"
             ]
           },