Fix version, set build instructions

README.md

@@ -1,6 +1,19 @@
 # archetype-languageserver
 A language server for OpenEHR archetypes, to be used in your favorite IDE
 
-Warning: probably will not compile yet, you need the branch preserve_aom_file_positions in github.com/openehr/archie to compile against for this to work.
+# Build instructions
+- clone github.com/openehr/archie, branch preserve_aom_file_positions
+- add `includeBuild 'path-to-archie'` in your settings.gradle file
+- download the mac, linux, and windows openJDK binaries, version 14 or newer
+- use one of the version 14 openJDK vms to compile the project
+- copy `gradle.example.properties` to `gradle.properties`
+- cahnge the JDK locations in the gradle properties file
+- `./gradlew clean build runtime buildExtension`
+
+The output will be in the .vsix file in `./vscode-extension`. 
+
+It contains a linked windows, linux and macos JRE from the OpenJDK project, so should run on whatever OS needed, but x86 only for now.
+If you want ARM, very easy as well, just download the ARM openJDK and change the runtime config in build.gradle
+
+This is not yet published to the VSCode marketplace, so instructions for that will follow later.
 
-You also need to integrate this into your favorite IDE of choice. connects using a socket, port 1278, for now, for development purposes, integrated vscode extension, dev extension and better instructions coming soon.

vscode-extension/client/src/extension.ts

@@ -1,7 +1,7 @@
 'use strict';
 
 import * as net from 'net';
-
+import * as path from 'path';
 import {Trace} from 'vscode-jsonrpc';
 import { window, workspace, commands, ExtensionContext, Uri } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ExecutableOptions, Executable, StreamInfo, Position as LSPosition, Location as LSLocation, TransportKind } from 'vscode-languageclient';
@@ -22,24 +22,39 @@ export function activate(context: ExtensionContext) {
     // };
 
     let serverOptions;
-    if(process.platform == 'win32') {
-        serverOptions = { 
-            run: {  
-                command: context.extensionPath + '\\archie-lsp-shadow\\bin\\archie-lsp.bat'
+    if(process.arch != 'x32' && process.arch != 'x64') {
+        throw 'unsupported CPU, this extension only runs on windows, macos or linux on x86 CPUs: ' + process.arch
+    }
+    if (process.platform == 'win32') {
+        serverOptions = {
+            run: {
+                command: path.join(context.extensionPath , 'lsp-images', 'archie-lsp-winx64', 'bin', 'archie-lsp.bat')
             },
-            debug: {  
-                command: context.extensionPath + '\\archie-lsp-shadow\\bin\\archie-lsp.bat'
+            debug: {
+                command: path.join(context.extensionPath , 'lsp-images', 'archie-lsp-winx64', 'bin', 'archie-lsp.bat')
             }
-        }
-    } else {
+        };
+    }
+    else if(process.platform == 'darwin') {
         serverOptions = {
-            run: {  
-                command: context.extensionPath + '/archie-lsp-shadow/bin/archie-lsp'
+            run: {
+                command: path.join(context.extensionPath , 'lsp-images', 'archie-lsp-macos', 'bin', 'archie-lsp')
             },
-            debug: {  
-                command: context.extensionPath + '/archie-lsp-shadow/bin/archie-lsp'
+            debug: {
+                command: path.join(context.extensionPath , 'lsp-images', 'archie-lsp-macos', 'bin', 'archie-lsp')
             }
-        }
+        };
+    } else if (process.platform == 'linux') {
+        serverOptions = {
+            run: {
+                command: path.join(context.extensionPath , 'lsp-images', 'archie-lsp-linux-x64', 'bin', 'archie-lsp')
+            },
+            debug: {
+                command: path.join(context.extensionPath , 'lsp-images', 'archie-lsp-linux-x64', 'bin', 'archie-lsp')
+            }
+        };
+    } else {
+        throw 'unsupported platform, this extension only runs on windows, macos or linux on x86 CPUs: ' + process.platform
     }
 
     let clientOptions: LanguageClientOptions = {

vscode-extension/package.json

@@ -3,7 +3,7 @@
 	"description": "OpenEHR ADL support, including syntax highlighting and validation",
 	"author": "Nedap Healthcare",
 	"license": "Apache",
-	"version": "1.0.0",
+	"version": "0.1.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/nedap/archetype-languageserver"