Some improvements in the generation of VSIX

* Since package.json is generated, update src/lsp/superbol_free_lib/project.ml
* Split Makefile.header rules to be called from SuperBOL CI
* Some improvements in Vscode Manifest types

Author: lefessan

.gitignore

@@ -16,7 +16,7 @@ _build
 /_opam
 /_build
 .drom.config
-/dist
+/_dist
 /node_modules
 /yarn-error.log
 /yarn.lock
@@ -28,5 +28,6 @@ ATTIC
 *.vsix
 *.opam.locked
 /emacs/lsp-superbol-customs.el
+/_out
 
 

.vscodeignore

@@ -6,6 +6,6 @@
 !syntaxes/
 !README.md
 !CHANGELOG.md
-!LICENSE
+!LICENSE.md
 !package.json
 !astexplorer/dist/index.html

Makefile.header

@@ -10,32 +10,54 @@ LSP_MODE_SRCDIR ?= ../lsp-mode
 all: superbol-free
 superbol-free: build
 	$(CP) _build/default/src/lsp/superbol-free/main.exe superbol-free
+	cp -f package.json package.json.prev
+	./superbol-free json vscode --gen package.json
+	diff -u package.json.prev package.json && rm -f package.json.prev 
 
 .PHONY: compile
 compile: build
-	yarn esbuild _build/default/$(SRCDIR)/$(PROJECT).bc.js \
+	$(MAKE) yarn-build
+
+yarn-build:
+	mkdir -p _out
+	$(CP) _build/default/$(SRCDIR)/$(PROJECT).bc.js _out/
+	yarn esbuild _out/$(PROJECT).bc.js \
                 --bundle \
                 --external:vscode \
-                --outdir=dist \
+                --outdir=_dist \
                 --platform=node \
                 --target=es6 \
                 --sourcemap
-# the last command generated dist/$(PROJECT).bs.js
+# the last command generated _dist/$(PROJECT).bs.js
 
 .PHONY: compile-release
-compile-release:
+compile-release: build-release
+	$(MAKE) yarn-release
+
+build-release:
 	opam exec -- dune build $(SRCDIR)/$(PROJECT).bc.js --profile=release
-	yarn esbuild _build/default/$(SRCDIR)/$(PROJECT).bc.js \
+	mkdir -p _out
+	$(CP) _build/default/$(SRCDIR)/$(PROJECT).bc.js _out/
+
+yarn-release:
+	yarn esbuild _out/$(PROJECT).bc.js \
                 --bundle \
                 --external:vscode \
-                --outdir=dist \
+                --outdir=_dist \
                 --platform=node \
                 --target=es6 \
                 --minify-whitespace \
                 --minify-syntax \
                 --sourcemap \
                 --sources-content=false
 
+vsix:
+	vsce package --out superbol-vscode-platform.vsix --yarn
+deploy-vsce:
+	vsce publish --packagePath superbol-vscode-platform.vsix --yarn
+deploy-ovsx:
+	ovsx publish --yarn
+
 .PHONY: clean-execs
 distclean: clean-execs
 clean-execs:

package.json

@@ -1,60 +1,39 @@
 {
-  "name": "superbol",
-  "displayName": "Superbol COBOL",
-  "description": "Provides a COBOL mode in VSCode based on Superbol",
-  "license": "MIT",
-  "version": "0.1.0",
-  "publisher": "ocamlpro",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/OCamlPro/superbol-vscode-platform"
-  },
-  "homepage": "https://ocamlpro.com/cobol",
-  "author": {
-    "name": "OCamlPro SAS",
-    "email": "[email protected]"
-  },
-  "keywords": [
-    "cobol",
-    "gnucobol"
-  ],
   "engines": {
     "vscode": "^1.64.0"
   },
-  "categories": [
-    "Formatters",
-    "Programming Languages",
-    "Linters",
-    "Snippets",
-    "Other"
-  ],
   "activationEvents": [
     "onLanguage:cobol",
     "onDebug"
   ],
   "contributes": {
-    "languages": [
+    "breakpoints": [
       {
-        "id": "cobol",
-        "aliases": [
-          "COBOL"
-        ],
-        "filenamePatterns": [
-          "*.cbl",
-          "*.cob"
-        ]
+        "language": "COBOL"
       }
     ],
+    "configuration": {
+      "title": "Superbol COBOL",
+      "properties": {
+        "superbol.globalFormatTakesSelection": {
+          "type": "boolean",
+          "default": false,
+          "description": "If something is selected, only format the selection"
+        },
+        "superbol.path": {
+          "default": "",
+          "description": "Path to the `superbol` command"
+        }
+      }
+    },
     "debuggers": [
       {
         "type": "cobol",
+        "label": "GnuCOBOL Debugger",
+        "program": "gdb",
         "languages": [
           "cobol"
         ],
-        "program": "gdb",
-        "args": [
-          "--init-eval-command=\"source /usr/local/bin/cobcd.py\""
-        ],
         "configurationAttributes": {
           "launch": {
             "type": "cobol",
@@ -83,59 +62,68 @@
         ]
       }
     ],
-    "breakpoints": [
+    "languages": [
       {
-        "language": "COBOL"
+        "id": "cobol",
+        "aliases": [
+          "COBOL"
+        ],
+        "filenamePatterns": [
+          "*.cbl",
+          "*.cob"
+        ]
       }
     ],
-    "configuration": {
-      "title": "Superbol COBOL",
-      "properties": {
-        "superbol.globalFormatTakesSelection": {
-          "type": "boolean",
-          "default": false,
-          "description": "If something is selected, only format the selection"
-        },
-        "superbol.path": {
-          "type": "string",
-          "default": "",
-          "description": "Path to the `superbol` command"
-        }
-      }
-    },
     "taskDefinitions": [
-        {
-            "type": "superbol",
-            "properties": {
-                "copybooks": {
-                    "type": "array",
-                    "description": "The list of copybooks paths"
-                },
-                "sourceFormat": {
-                    "type": "string",
-                    "description": "The source format of the code"
-                },
-                "dialect": {
-                    "type": "string",
-                    "description": "The COBOL dialect used"
-                },
-                "forDebugging": {
-                    "type": "boolean",
-                    "description": "Build for debugging"
-                },
-                "extensions": {
-                    "type": "array",
-                    "description": "Add cobol file extensions"
-                }
-            }
+      {
+        "type": "superbol",
+        "properties": {
+          "copybooks": {
+            "type": "array",
+            "description": "The list of copybooks paths"
+          },
+          "sourceFormat": {
+            "description": "The source format of the code"
+          },
+          "dialect": {
+            "description": "The COBOL dialect used"
+          },
+          "forDebugging": {
+            "type": "boolean",
+            "description": "Build for debugging"
+          },
+          "extensions": {
+            "type": "array",
+            "description": "Add cobol file extensions"
+          }
         }
+      }
     ]
   },
-  "main": "./dist/superbol_vscode_platform.bc.js",
+  "name": "superbol",
+  "displayName": "Superbol Studio OSS",
+  "description": "Provides a COBOL mode in VSCode, based on SuperBOL Language Server Protocol for COBOL",
+  "license": "MIT",
+  "version": "0.1.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/OCamlPro/superbol-studio-oss"
+  },
+  "homepage": "https://get-superbol.com",
+  "author": {
+    "name": "SuperBOL at OCamlPro",
+    "email": "[email protected]"
+  },
+  "keywords": [
+    "cobol",
+    "gnucobol"
+  ],
+  "main": "./_dist/superbol_studio_oss.bc.js",
   "scripts": {
     "compile": "make compile",
-    "package": "vsce package --out superbol-vscode-platform.vsix --yarn",
-    "deploy:vsce": "vsce publish --packagePath superbol-vscode-platform.vsix --yarn",
+    "release": "make release",
+    "package": "vsce package --out superbol-studio-oss.vsix --yarn",
+    "deploy:vsce": "vsce publish --packagePath superbol-studio-oss.vsix --yarn",
     "deploy:ovsx": "ovsx publish --yarn"
   },
   "dependencies": {
@@ -155,5 +143,13 @@
     "prettier": "^2.5.1",
     "vsce": "^2.15.0",
     "vscode-test": "1.6.1"
-  }
-}
+  },
+  "publisher": "ocamlpro",
+  "categories": [
+    "Formatters",
+    "Programming Languages",
+    "Linters",
+    "Snippets",
+    "Other"
+  ]
+}

src/lsp/superbol_free_lib/command_json_package.ml renamed to src/lsp/superbol_free_lib/command_json_vscode.ml

@@ -22,7 +22,7 @@ let public_subcommands = [
   Command_texi2rst.cmd ;
   Command_indent_range.cmd;
   Command_indent_file.cmd;
-  Command_json_package.cmd;
+  Command_json_vscode.cmd;
 ]
 
 let main ?style_renderer ?utf_8 () =