From e6c974120bef0438facf6feef66ccd8c8c90191d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Tue, 8 Apr 2025 11:48:37 +0200 Subject: [PATCH 1/4] Update .gitigore file for VSC settings --- .gitignore | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e9557b6a..552a74e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ -.gradle -.idea -.settings +.* + +.vscode/* +!.vscode +!.vscode/extensions.json +!.vscode/launch.json +!.vscode/settings.json +!.vscode/tasks.json + build /apps @@ -15,8 +21,8 @@ build /static /*.properties +!/gradle.properties + /launcher.jar /passwd /start.* - -!/gradle.properties From 8caf790529de288e92a3e5e194557aa2886b9ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Tue, 8 Apr 2025 11:50:21 +0200 Subject: [PATCH 2/4] Remove custom configuration of Gradle sourceSets Using the sources in build creates a lot of confusion in VSC --- build.gradle | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build.gradle b/build.gradle index 9bde766c..63d5400e 100644 --- a/build.gradle +++ b/build.gradle @@ -42,15 +42,6 @@ if (JavaVersion.current().isJava8Compatible()) { } } -sourceSets { - main { - java { - // Sources in `src` will be available here after processing - srcDirs = ["$buildDir/src/main/java"] - } - } -} - configurations { // Wrapping implementation because it does not allow access to its files // (i.e. cannot be resolved) From f786b40961fabc009eafa3a276c037563bdb104c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Tue, 8 Apr 2025 11:52:11 +0200 Subject: [PATCH 3/4] Rename the modules project to prevent VSC from renaming the main project to helma_ Does not work, unfortunately --- settings.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings.gradle b/settings.gradle index c6fe1184..5fd2dc60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,3 +16,6 @@ project(':modules').projectDir = file('modules/helma') project(':jala').projectDir = file('modules/jala') project(':hopKit').projectDir = file('modules/jala/util/HopKit') project(':test').projectDir = file('modules/jala/util/Test') + +// Rename this project to prevent redundancy and renaming of main project (VSC does not care, though) +project(':modules').name = 'modules' From 96f2dce50fcc96764954bd291d093ea5daa0cbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Tue, 8 Apr 2025 12:05:54 +0200 Subject: [PATCH 4/4] Add launch configuration for debugging Helma --- .vscode/launch.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..b9116072 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,21 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Current File", + "request": "launch", + "mainClass": "${file}" + }, + { + "type": "java", + "name": "Debug", + "request": "launch", + "mainClass": "helma.main.Server", + "projectName": "helma_" + } + ] +}