Skip to content

Commit

Permalink
Move jars to a separate directory (#75)
Browse files Browse the repository at this point in the history
  • Loading branch information
holly-smile authored Sep 5, 2024
1 parent ae41cf1 commit dec07df
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ server
*.vsix
target
dist
jars/
bin
.vscode-test
coverage/
2 changes: 1 addition & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ src/
*.vsix
.gitignore
tsconfig.json
dist/jars
jars/
dist/test

.vscode-test
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/javaServiceInstaller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit dec07df

Please sign in to comment.