From 5ac24b4d5896147be644a348d56763b5d035e1ec Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Thu, 14 May 2026 18:10:05 +0200 Subject: [PATCH 1/8] dbeaver/dbvr#90 Add generate_workspace.sh --- generate_workspace.cmd | 2 ++ generate_workspace.sh | 6 ++++++ osgi-app.properties | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 generate_workspace.cmd create mode 100755 generate_workspace.sh create mode 100644 osgi-app.properties diff --git a/generate_workspace.cmd b/generate_workspace.cmd new file mode 100644 index 0000000..cd20c4a --- /dev/null +++ b/generate_workspace.cmd @@ -0,0 +1,2 @@ +@echo off +call %~dp0\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %~dp0 \ No newline at end of file diff --git a/generate_workspace.sh b/generate_workspace.sh new file mode 100755 index 0000000..174ded0 --- /dev/null +++ b/generate_workspace.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh + +script_dir="$(realpath "$(dirname "$0")")" +repositories_root_dir="$(realpath "$script_dir/..")" + +"$repositories_root_dir"/idea-rcp-launch-config-generator/runGenerator.sh "$script_dir" \ No newline at end of file diff --git a/osgi-app.properties b/osgi-app.properties new file mode 100644 index 0000000..33ae791 --- /dev/null +++ b/osgi-app.properties @@ -0,0 +1,25 @@ +workspaceName=dbvr-ce +featuresPaths=\ + dbeaver/features;\ + dbvr/features; +bundlesPaths=\ + dbeaver-common/modules;\ + dbeaver/plugins;\ + dbeaver/test;\ + dbeaver-jdbc-libsql;\ + dbvr/bundles;\ + dbvr/test; +repositories=\ + https://repo.dbeaver.net/p2/ce/latest/;\ + https://download.eclipse.org/releases/${eclipse-version}/; +testLibraries=\ + org.junit;\ + org.mockito.mockito-core;\ + junit-jupiter-api;\ + org.opentest4j;\ + org.hamcrest.core +productsPaths=\ + dbvr/product/community/dbvr.product;\ + dbvr/product/community-unittest/dbvr-unittest.product; +optionalFeatureRepositories=\ + dbeaver/product/repositories From 578a7d818dfcf2be1f944274e04e7ea56f861e49 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Fri, 15 May 2026 14:36:44 +0200 Subject: [PATCH 2/8] dbeaver/dbvr#90 Add generate_workspace.sh --- .ide/.idea/misc.xml | 27 +++++++++++++++++++++++++++ osgi-app.properties | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 .ide/.idea/misc.xml diff --git a/.ide/.idea/misc.xml b/.ide/.idea/misc.xml new file mode 100644 index 0000000..5d0f0f0 --- /dev/null +++ b/.ide/.idea/misc.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/osgi-app.properties b/osgi-app.properties index 33ae791..2ee3d88 100644 --- a/osgi-app.properties +++ b/osgi-app.properties @@ -21,5 +21,7 @@ testLibraries=\ productsPaths=\ dbvr/product/community/dbvr.product;\ dbvr/product/community-unittest/dbvr-unittest.product; +ideaConfigurationFilesPaths=\ + dbvr/.ide/.idea optionalFeatureRepositories=\ dbeaver/product/repositories From 7d484bb4f43abd36e207bdde9f97c2d3d88f0aa3 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Fri, 15 May 2026 18:15:26 +0200 Subject: [PATCH 3/8] dbeaver/dbvr#90 Add generate_workspace.sh --- osgi-app.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osgi-app.properties b/osgi-app.properties index 2ee3d88..e2ab440 100644 --- a/osgi-app.properties +++ b/osgi-app.properties @@ -20,7 +20,8 @@ testLibraries=\ org.hamcrest.core productsPaths=\ dbvr/product/community/dbvr.product;\ - dbvr/product/community-unittest/dbvr-unittest.product; + dbvr/product/community-unittest/dbvr-unittest.product;\ + dbeaver/product/community/DBeaver.product; ideaConfigurationFilesPaths=\ dbvr/.ide/.idea optionalFeatureRepositories=\ From ff996ca2f3615e27e53e14381c7a4223ac036164 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Mon, 18 May 2026 10:06:57 +0200 Subject: [PATCH 4/8] dbeaver/dbvr#90 Add generate_workspace.sh --- docs/build.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docs/build.md diff --git a/docs/build.md b/docs/build.md new file mode 100644 index 0000000..516c1ff --- /dev/null +++ b/docs/build.md @@ -0,0 +1,34 @@ +# Building DBeaver CLI (dbvr) + +This document describes how to build the `dbvr` product from source and how to +generate an IntelliJ IDEA workspace for development. + +## Prerequisites + +- JDK 21 or higher +- Apache Maven 3.9.x or higher (the bundled `dbeaver-common/mvnw` wrapper can be used instead) + +## Repository layout + +`dbvr` is built together with sibling repositories. Clone all of them into the +same parent directory so the relative paths in the Maven/Tycho build resolve +correctly + +```bash +git clone https://github.com/dbeaver/dbeaver-common.git +git clone https://github.com/dbeaver/dbeaver.git +git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git +git clone https://github.com/dbeaver/dbvr.git +git clone https://github.com/dbeaver/idea-rcp-launch-config-generator.git +git clone https://github.com/dbeaver/dbeaver-osgi-common.gitlfdf +``` + +## Build the product + +Run from the `dbvr` repository root: + +```bash +./generate_workspace.sh +``` + +On Windows use `generate_workspace.cmd`. From dcdea80e2c818a427a37588ffd0dd01f6a4d54b8 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Mon, 18 May 2026 14:14:51 +0200 Subject: [PATCH 5/8] dbeaver/dbvr#90 Remove misc.xml --- .ide/.idea/misc.xml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .ide/.idea/misc.xml diff --git a/.ide/.idea/misc.xml b/.ide/.idea/misc.xml deleted file mode 100644 index 5d0f0f0..0000000 --- a/.ide/.idea/misc.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - From bc59069751a003d4d7af5dd13cfeb7d89a92c5e9 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Mon, 18 May 2026 14:19:05 +0200 Subject: [PATCH 6/8] dbeaver/dbvr#90 Remove misc.xml --- docs/build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build.md b/docs/build.md index 516c1ff..f8c865d 100644 --- a/docs/build.md +++ b/docs/build.md @@ -20,7 +20,7 @@ git clone https://github.com/dbeaver/dbeaver.git git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git git clone https://github.com/dbeaver/dbvr.git git clone https://github.com/dbeaver/idea-rcp-launch-config-generator.git -git clone https://github.com/dbeaver/dbeaver-osgi-common.gitlfdf +git clone https://github.com/dbeaver/dbeaver-osgi-common.git ``` ## Build the product From 094da2310a9ee78815b44b791973382ec586a2f3 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Mon, 18 May 2026 16:00:26 +0200 Subject: [PATCH 7/8] dbeaver/dbvr#90 Edit dbvr doc --- README.md | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index cff6c99..9a9899e 100644 --- a/README.md +++ b/README.md @@ -38,30 +38,46 @@ To build this repository locally, you need: The root Maven build inherits from `../dbeaver`, and the product aggregate also includes sibling modules from `../../../dbeaver-common` and `../../../dbeaver`. -### Clone the required repositories +## Repository layout + +`dbvr` is built together with sibling repositories. Clone all of them into the +same parent directory so the relative paths in the Maven/Tycho build resolve +correctly ```bash git clone https://github.com/dbeaver/dbeaver-common.git git clone https://github.com/dbeaver/dbeaver.git git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git git clone https://github.com/dbeaver/dbvr.git +git clone https://github.com/dbeaver/idea-rcp-launch-config-generator.git +git clone https://github.com/dbeaver/dbeaver-osgi-common.git +``` +## Build product +```bash +mvn -f product/aggregate/pom.xml \ +-Dheadless-platform \ +-Pproduct-dbvr-ce \ +-Dbuild.all-environments \ +package ``` -Arrange them as sibling directories so the relative paths in the Maven/Tycho build resolve correctly. - -### Build the project +## Develop in IDEA -From the `dbvr` repository root: +To generate IntelliJ IDEA project files and RCP launch configurations, run from the `dbvr` repository root: ```bash -mvn -f product/aggregate/pom.xml \ - -Dheadless-platform \ - -Pproduct-dbvr-ce \ - -Dbuild.all-environments \ - package +./generate_workspace.sh ``` -This is the same aggregate build profile used by the repository CI workflow. +On Windows use `generate_workspace.cmd`. + +Then run +```bash +cd ../dbeaver +``` +```bash +mvn generate-sources +``` ### Run the CLI From 1e298037f1106448b1aa4786da5551fe93596082 Mon Sep 17 00:00:00 2001 From: Tsimafei Labanovich Date: Mon, 18 May 2026 16:01:51 +0200 Subject: [PATCH 8/8] dbeaver/dbvr#90 Edit dbvr doc --- docs/build.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 docs/build.md diff --git a/docs/build.md b/docs/build.md deleted file mode 100644 index f8c865d..0000000 --- a/docs/build.md +++ /dev/null @@ -1,34 +0,0 @@ -# Building DBeaver CLI (dbvr) - -This document describes how to build the `dbvr` product from source and how to -generate an IntelliJ IDEA workspace for development. - -## Prerequisites - -- JDK 21 or higher -- Apache Maven 3.9.x or higher (the bundled `dbeaver-common/mvnw` wrapper can be used instead) - -## Repository layout - -`dbvr` is built together with sibling repositories. Clone all of them into the -same parent directory so the relative paths in the Maven/Tycho build resolve -correctly - -```bash -git clone https://github.com/dbeaver/dbeaver-common.git -git clone https://github.com/dbeaver/dbeaver.git -git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git -git clone https://github.com/dbeaver/dbvr.git -git clone https://github.com/dbeaver/idea-rcp-launch-config-generator.git -git clone https://github.com/dbeaver/dbeaver-osgi-common.git -``` - -## Build the product - -Run from the `dbvr` repository root: - -```bash -./generate_workspace.sh -``` - -On Windows use `generate_workspace.cmd`.