From 7f1ce4ce70320f120f163a0215db97ad167c4368 Mon Sep 17 00:00:00 2001 From: ShadelessFox Date: Wed, 21 May 2025 12:39:32 +0200 Subject: [PATCH 1/2] dbeaver/pro#5774 Correctly handle current working directory --- runGenerator.cmd | 10 ++++++---- runGenerator.sh | 37 ++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/runGenerator.cmd b/runGenerator.cmd index ef8d8ec..c3b2438 100644 --- a/runGenerator.cmd +++ b/runGenerator.cmd @@ -2,8 +2,10 @@ setlocal +set "MAVEN_ARGS=-Djdk.xml.maxGeneralEntitySizeLimit=2097152 -Djdk.xml.totalEntitySizeLimit=2097152" +set "GENERATOR_DIR=%~dp0" set "WORKING_DIR=" -cd %~dp0 + :: Parse command line arguments :parseArgs if "%~1"=="" goto :checkDir @@ -19,15 +21,15 @@ goto :parseArgs :checkDir if "%WORKING_DIR%"=="" ( echo No folder containing rcp_gen specified - exit /b 1 + goto :end ) echo Build generator -call ..\dbeaver-common\mvnw.cmd install -q -f "aggregate" +call %GENERATOR_DIR%..\dbeaver-common\mvnw.cmd install -T1C %MAVEN_ARGS% -q -f "%GENERATOR_DIR%aggregate" echo Run generator :: Run the Maven commands with the specified options -call ..\dbeaver-common\mvnw.cmd -f "pom.xml" package -T 1C -q exec:java -Dexec.args="-eclipse.version ${eclipse-version} -updateWorkspace -config %WORKING_DIR%osgi-app.properties -projectsFolder %WORKING_DIR%..\ -eclipse %WORKING_DIR%..\dbeaver-workspace\dependencies -output %WORKING_DIR%..\dbeaver-workspace/products/" +call %GENERATOR_DIR%..\dbeaver-common\mvnw.cmd -f "%GENERATOR_DIR%pom.xml" package -T1C %MAVEN_ARGS% -q exec:java -Dexec.args="-eclipse.version ${eclipse-version} -updateWorkspace -config %WORKING_DIR%osgi-app.properties -projectsFolder %WORKING_DIR%..\ -eclipse %WORKING_DIR%..\dbeaver-workspace\dependencies -output %WORKING_DIR%..\dbeaver-workspace\products" :end endlocal diff --git a/runGenerator.sh b/runGenerator.sh index a3aabc2..4022123 100755 --- a/runGenerator.sh +++ b/runGenerator.sh @@ -1,23 +1,26 @@ -#!/bin/bash +#!/usr/bin/env sh -cd "$(dirname "$0")" +set -e -while getopts f: flag -do - case "${flag}" in - f) WORKING_DIR=${OPTARG};; - esac -done -echo "$WORKING_DIR" -if [ -z "$WORKING_DIR" ]; then - echo "No folder containing rcp_gen specified" +target_repo="$1" +if [ -z "$target_repo" ]; then + echo "target repository is not specified" exit 1 fi -../dbeaver-common/mvnw install -q -f "aggregate" -# Run the Maven commands with the specified options -../dbeaver-common/mvnw -f "pom.xml" \ - package \ - -T 1C \ + +script_dir="$(realpath "$(dirname "$0")")" +repositories_root_dir="$(realpath "$script_dir/..")" + +echo "Compiling workspace generator dependencies..." + +"$repositories_root_dir/dbeaver-common/mvnw" install \ + -T1C \ + -q \ + -f "$script_dir/aggregate" + +"$repositories_root_dir/dbeaver-common/mvnw" package \ + -T1C \ -q \ + -f "$script_dir/pom.xml" \ exec:java \ - -Dexec.args="-eclipse.version \${eclipse-version} -updateWorkspace -config $WORKING_DIR/osgi-app.properties -projectsFolder $WORKING_DIR/../ -eclipse $WORKING_DIR/../dbeaver-workspace/dependencies -output $WORKING_DIR/../dbeaver-workspace/products/" + -Dexec.args="-eclipse.version \${eclipse-version} -updateWorkspace -config $target_repo/osgi-app.properties -projectsFolder $repositories_root_dir -eclipse $repositories_root_dir/dbeaver-workspace/dependencies -output $repositories_root_dir/dbeaver-workspace/products/" From d7678f4611e1179c56cc921854a55755c2123082 Mon Sep 17 00:00:00 2001 From: ShadelessFox Date: Wed, 21 May 2025 12:39:49 +0200 Subject: [PATCH 2/2] dbeaver/pro#5774 Fix logging --- .../jkiss/tools/rcplaunchconfig/EntryPoint.java | 14 +++++++------- .../producers/iml/IMLConfigurationProducer.java | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/jkiss/tools/rcplaunchconfig/EntryPoint.java b/src/main/java/org/jkiss/tools/rcplaunchconfig/EntryPoint.java index 7aebb16..12c292a 100644 --- a/src/main/java/org/jkiss/tools/rcplaunchconfig/EntryPoint.java +++ b/src/main/java/org/jkiss/tools/rcplaunchconfig/EntryPoint.java @@ -104,8 +104,8 @@ private static void launchGenerate(String[] args) throws IOException, Repository ); } List executionResults = forkJoinPool.submit(() -> pathsManager.getProductsPathsAndWorkDirs().entrySet().parallelStream().map((productPath) -> { - log.info("Starting generation for: %s" + productPath); - log.debug("Thread name %s used for %s".formatted(Thread.currentThread().getName(), productPath)); + log.info("Starting generation for {}", productPath); + log.debug("Thread name {} used for {}", Thread.currentThread().getName(), productPath); try { Result result = new Result(); result.setWorkDir(productPath.getValue()); @@ -125,15 +125,15 @@ private static void launchGenerate(String[] args) throws IOException, Repository try { Files.createDirectories(resultPath.getParent()); } catch (Throwable throwable) { - log.debug("Error creating target parent directories for %s".formatted(resultPath)); + log.debug("Error creating target parent directories for {}", resultPath); } try { FileUtils.removeAllFromDir(resultPath); } catch (Throwable e) { - log.debug("Error deleting target folder for %s".formatted(resultPath), e); + log.debug("Error deleting target folder for {}", resultPath, e); } - log.info("Product generation for %s completed".formatted(result.getProductId())); - log.debug("Thread %s finished execution".formatted(Thread.currentThread().getName())); + log.info("Product generation for {} completed", result.getProductId()); + log.debug("Thread {} finished execution", Thread.currentThread().getName()); dependencyGraph.printDependencyTree(root); return new ResultInfo(productPath, result, resultPath); } catch (XMLStreamException | IOException e) { @@ -168,7 +168,7 @@ private static void launchGenerate(String[] args) throws IOException, Repository } { - log.info("Starting to load test bundles for %s...".formatted(result.getProductName())); + log.info("Starting to load test bundles for {}...", result.getProductName()); PluginResolver.resolveTestBundlesAndLibraries(result, result.getProductGraph()); } { diff --git a/src/main/java/org/jkiss/tools/rcplaunchconfig/producers/iml/IMLConfigurationProducer.java b/src/main/java/org/jkiss/tools/rcplaunchconfig/producers/iml/IMLConfigurationProducer.java index c8f841a..acf0c27 100644 --- a/src/main/java/org/jkiss/tools/rcplaunchconfig/producers/iml/IMLConfigurationProducer.java +++ b/src/main/java/org/jkiss/tools/rcplaunchconfig/producers/iml/IMLConfigurationProducer.java @@ -427,8 +427,7 @@ private void appendLibraryInfo( boolean isLibrary) { resolvedBundles.add(new Pair<>(bundleInfo.getBundleName(), new Version(bundleInfo.getBundleVersion()))); if (bundleInfo.getPath() == null) { - log.error("Error appending library info to non existing module %s, should not happen" - .formatted(bundleInfo.getBundleName())); + log.error("Error appending library info to non existing module {}, should not happen", bundleInfo.getBundleName()); return; } if (bundleInfo.getPath().toFile().isDirectory()) {