From 52db4a145057303d2eb4391cfc95db7b6d5a9d66 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Mon, 26 Jun 2023 16:21:35 +0200 Subject: [PATCH] Download jar from GitLab CI instead of building it under node_modules --- .vscodeignore | 6 ------ package-lock.json | 19 ------------------- package.json | 7 ++----- src/extension.ts | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/.vscodeignore b/.vscodeignore index 84c0194..c437311 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -3,9 +3,3 @@ .vscode/** .gitignore media/screencaputer.gif - -node_modules/b-language-server/** -!node_modules/b-language-server/build/libs/b-language-server-all.jar -!node_modules/b-language-server/LICENSE -!node_modules/b-language-server/package.json -!node_modules/b-language-server/README.md diff --git a/package-lock.json b/package-lock.json index 58ff83c..b008a17 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,12 @@ "version": "2.1.0", "license": "EPL-2.0", "dependencies": { - "b-language-server": "https://github.com/hhu-stups/b-language-server#master", "vscode-languageclient": "^8.1.0" }, "devDependencies": { "@types/node": "^14.14.44", "@types/vscode": "^1.67.0", "@vscode/vsce": "^2.19.0", - "run-script-os": "^1.1.6", "typescript": "^4.8.4" }, "engines": { @@ -162,14 +160,6 @@ "typed-rest-client": "^1.8.4" } }, - "node_modules/b-language-server": { - "version": "2.0.0", - "resolved": "git+ssh://git@github.com/hhu-stups/b-language-server.git#7876fc21d0ca151869fbad2b2562946bce09903f", - "license": "EPL-2.0", - "dependencies": { - "run-script-os": "^1.1.1" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1043,15 +1033,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/run-script-os": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz", - "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==", - "bin": { - "run-os": "index.js", - "run-script-os": "index.js" - } - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", diff --git a/package.json b/package.json index 34bb840..517ca2a 100644 --- a/package.json +++ b/package.json @@ -141,19 +141,16 @@ "scripts": { "vscode:prepublish": "tsc -p ./", "compile": "tsc -watch -p ./", - "package": "vsce package", - "postinstall:nix": "./node_modules/b-language-server/gradlew shadowjar -p ./node_modules/b-language-server", - "postinstall:windows": "./node_modules/b-language-server/gradlew.bat shadowjar -p ./node_modules/b-language-server" + "download_jar": "curl -fL -o \"out/b-language-server-all.jar\" \"https://gitlab.cs.uni-duesseldorf.de/api/v4/projects/2834/jobs/artifacts/master/raw/build/libs/b-language-server-all.jar?job=test\"", + "package": "vsce package" }, "devDependencies": { "@types/node": "^14.14.44", "@types/vscode": "^1.67.0", "@vscode/vsce": "^2.19.0", - "run-script-os": "^1.1.6", "typescript": "^4.8.4" }, "dependencies": { - "b-language-server": "https://github.com/hhu-stups/b-language-server#master", "vscode-languageclient": "^8.1.0" } } diff --git a/src/extension.ts b/src/extension.ts index 578107e..c3c2393 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -26,7 +26,7 @@ let debugChannle: OutputChannel = null; export function activate(context: ExtensionContext) { - const serverHome = context.asAbsolutePath(path.join('node_modules', 'b-language-server', 'build', 'libs', 'b-language-server-all.jar')) + const serverHome = context.asAbsolutePath(path.join('out', 'b-language-server-all.jar')) const javaHome: string = workspace.getConfiguration("common").get("javaHome") -- GitLab