From 37e4c699fe3be1725cd4dc9bc3dd9158af8c553b Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 20 Mar 2024 18:34:25 +0800 Subject: [PATCH] chore: update vscode configs (#2483) --- .gitignore | 1 + .vscode/launch.json | 9 ++++++--- .vscode/tasks.json | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3524245593..7fac8c0591 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ server/test/io.cloudbeaver.test.platform/workspace/.data/ .classpath .settings/ +workspace-dev-ce/ deploy/cloudbeaver server/**/target apps/**/target \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 86904cf91a..48e9e385c6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -21,7 +21,8 @@ { "type": "java", "name": "CloudBeaver CE", - "cwd": "${workspaceFolder}/../opt/cbce", + "cwd": "${workspaceFolder}/workspace-dev-ce", + "preLaunchTask": "Generate dev proprties for CBCE", "request": "launch", "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher", "windows": { @@ -75,8 +76,10 @@ "-arch", "aarch64", "-nl", - "en_US", - "-showsplash" + "en", + "-showsplash", + "-web-config", + "conf/cloudbeaver.conf" ], "vmArgs": [ "-XX:+IgnoreUnrecognizedVMOptions", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e4d2138e1d..76dcaebf59 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -33,6 +33,35 @@ "cwd": "${workspaceFolder}/webapp/packages/product-default" } }, + { + "label": "Generate dev proprties for CBCE", + "type": "shell", + "command": "mvn", + "osx": { + "args": [ + "package", + "-q", + "exec:java", + "-Dexec.args=-config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product" + ] + }, + "windows": { + "args": [ + "package", + "-q", + "exec:java", + "-Dexec.args=-config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../eclipse/eclipse -output ${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product" + ] + }, + "options": { + "cwd": "${workspaceFolder}/../idea-rcp-launch-config-generator" + }, + "presentation": { + "reveal": "silent", + "close": true, + "clear": false + } + }, { "label": "Build CE", "type": "shell",