final fix for 7.5.4 folder build issue

Author: N6REJ

build.gradle

@@ -814,6 +814,11 @@ tasks.register('release') {
             exclude 'deps.properties'
         }
 
+        // Create VERSION file in prep directory (for archive)
+        def versionFilePrep = file("${bundleTmpPrepPath}/${bundleName}VERSION")
+        versionFilePrep.text = bundleVersion
+        println "Created VERSION file for archive: ${versionFilePrep.name}"
+
         // Copy to bundles_build directory (non-zip dev artifact)
         // Structure: bearsampp-build/tmp/bundles_build/tools/powershell/powershell7.5.4/
         println ""
@@ -866,18 +871,33 @@ tasks.register('release') {
 
             println "Using 7-Zip: ${sevenZipExe}"
 
-            // Create 7z archive (standard Bruno approach - archive the directory contents)
+            // Create archive with directory structure: powershell7.5.4/...
+            // First, create a staging directory with the proper structure
+            def archiveStagingPath = file("${buildTmpPath}/bundles_archive/${bundleType}/${bundleName}")
+            if (archiveStagingPath.exists()) {
+                delete archiveStagingPath
+            }
+            archiveStagingPath.mkdirs()
+
+            // Copy prep contents into versioned directory
+            def versionedDir = file("${archiveStagingPath}/${bundleName}${bundleVersion}")
+            copy {
+                from bundleTmpPrepPath
+                into versionedDir
+            }
+
+            // Create 7z archive from staging directory
             def command = [
                 sevenZipExe,
                 'a',
                 '-t7z',
                 archiveFile.absolutePath.toString(),
-                '.'
+                "${bundleName}${bundleVersion}"
             ]
 
-            // Run from the prep directory to archive its contents
+            // Run from the staging directory to archive the versioned folder
             def process = new ProcessBuilder(command as String[])
-                .directory(bundleTmpPrepPath)
+                .directory(archiveStagingPath)
                 .redirectErrorStream(true)
                 .start()
 
@@ -905,8 +925,25 @@ tasks.register('release') {
 
             println "Compressing ${bundleName}-${bundleVersion} to ${archiveFile.name}..."
 
-            // Archive the directory contents (standard Bruno approach)
-            ant.zip(destfile: archiveFile, basedir: bundleTmpPrepPath)
+            // Create archive with directory structure: powershell7.5.4/...
+            // Create a staging directory with the proper structure
+            def archiveStagingPath = file("${buildTmpPath}/bundles_archive/${bundleType}/${bundleName}")
+            if (archiveStagingPath.exists()) {
+                delete archiveStagingPath
+            }
+            archiveStagingPath.mkdirs()
+
+            // Copy prep contents into versioned directory
+            def versionedDir = file("${archiveStagingPath}/${bundleName}${bundleVersion}")
+            copy {
+                from bundleTmpPrepPath
+                into versionedDir
+            }
+
+            // Archive the versioned directory
+            ant.zip(destfile: archiveFile) {
+                zipfileset(dir: archiveStagingPath, includes: "**/*")
+            }
 
             println "Archive created: ${archiveFile}"