From cf5405478f9fd4e42e0990e9985c2733b46c9072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= <interface@p3k.org>
Date: Sat, 1 Mar 2025 17:44:47 +0100
Subject: [PATCH] Add intermediate directory to archive files

---
 build.gradle                | 10 ++++++++--
 tools/antclick/build.gradle | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1965fd35..640d3b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -291,7 +291,10 @@ tasks.register('distZip', Zip) {
   inputs.dir antvilleInstallDir
   outputs.file "$outputDir/$outputFile"
 
-  from antvilleInstallDir
+  from (antvilleInstallDir) {
+    into "antville-${version}"
+  }
+
   destinationDirectory = file(outputDir)
   archiveFileName = outputFile
 }
@@ -308,7 +311,10 @@ tasks.register('distTar', Tar) {
   inputs.dir antvilleInstallDir
   outputs.file "$outputDir/$outputFile"
 
-  from antvilleInstallDir
+  from (antvilleInstallDir) {
+    into "antville-${version}"
+  }
+
   compression = Compression.BZIP2
   destinationDirectory = file(outputDir)
   archiveFileName = outputFile
diff --git a/tools/antclick/build.gradle b/tools/antclick/build.gradle
index 2d69cb57..d4e4dff5 100644
--- a/tools/antclick/build.gradle
+++ b/tools/antclick/build.gradle
@@ -195,7 +195,10 @@ tasks.register('distZip', Zip) {
   inputs.dir helmaInstallDir
   outputs.file "$outputDir/$outputFile"
 
-  from helmaInstallDir
+  from (helmaInstallDir) {
+    into "antclick-${version}"
+  }
+
   destinationDirectory = file(outputDir)
   archiveFileName = outputFile
 }
@@ -212,7 +215,10 @@ tasks.register('distTar', Tar) {
   inputs.dir helmaInstallDir
   outputs.file "$outputDir/$outputFile"
 
-  from helmaInstallDir
+  from (helmaInstallDir) {
+    into "antclick-${version}"
+  }
+
   compression = Compression.BZIP2
   destinationDirectory = file(outputDir)
   archiveFileName = outputFile