diff --git a/.gitignore b/.gitignore index 064a07a..bb976e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ server *.vsix target dist +jars/ bin .vscode-test coverage/ diff --git a/.vscodeignore b/.vscodeignore index a54c81a..7722847 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -4,7 +4,7 @@ src/ *.vsix .gitignore tsconfig.json -dist/jars +jars/ dist/test .vscode-test diff --git a/README.md b/README.md index 0eb4067..ef8150a 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Run the `debug` launch from VS Code TIP: The cql-language-server that provides error highlighting is a Java project. It's also launched in debug mode when this VS Code extension is launched in debug mode, allowing you to attach a Java debugger as well. If you're simultaneously iterating on the cql-language-server, you can create a symlink to that Java artifact and changes will be picked up when VS Code restarts. On linux: -`vscode-cql/dist/jars$ ln -s your-repo-home/cql-language-server/ls/service/target/cql-ls-service-1.5.8.jar cql-ls-service-1.5.8.jar` +`vscode-cql/jars$ ln -s your-repo-home/cql-language-server/ls/service/target/cql-ls-service-1.5.8.jar cql-ls-service-1.5.8.jar` Set your repo home directory and update the versions as needed. diff --git a/package.json b/package.json index 975d6c3..028699c 100644 --- a/package.json +++ b/package.json @@ -158,6 +158,7 @@ "watch": "tsc -watch -p ./", "pretest": "npm run clean && npm run compile && cp -r src/test/suite/resources dist/test/suite/resources", "clean": "rm -rf ./dist", + "clean-all": "npm run clean && rm -rf ./jars", "test": "c8 --check-coverage --lines 80 --functions 80 --branches 80 vscode-test" }, "javaDependencies": { diff --git a/src/javaServiceInstaller.ts b/src/javaServiceInstaller.ts index 1456a6c..acce2f7 100644 --- a/src/javaServiceInstaller.ts +++ b/src/javaServiceInstaller.ts @@ -13,7 +13,7 @@ interface MavenCoords { } function getJarHome(): string { - return path.join(__dirname, 'jars'); + return path.join(__dirname, '../jars'); } export function getServicePath(context: ExtensionContext, serviceName: string): string {