Add createReleaseTarball task, GIT_TAG_OVERRIDE option, use tar in flake

Author: toasterofbread

buildSrc/src/main/kotlin/plugins/generate-build-config.gradle.kts

@@ -84,7 +84,8 @@ fun Task.buildConfig(debug_mode: Boolean) {
     )
 
     buildConfig {
-        val git_tag: String? = Command.getCurrentGitTag()
+        val tag_override: String? = project.properties["GIT_TAG_OVERRIDE"] as String?
+        val git_tag: String? = (tag_override ?: Command.getCurrentGitTag())?.ifBlank { null }
         buildConfigField("GIT_TAG", git_tag)
         buildConfigField("GIT_COMMIT_HASH", if (git_tag != null) null else Command.getCurrentGitCommitHash())
         buildConfigField("IS_DEBUG", debug_mode)

desktopApp/build.gradle.kts

@@ -4,6 +4,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
 import plugin.spmp.SpMpDeps
 import plugin.spmp.getDeps
 import java.io.FileInputStream
@@ -17,10 +18,6 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-enum class OS {
-    LINUX, WINDOWS;
-}
-
 val local_properties_path: String = "local.properties"
 val strings_file: File = rootProject.file("shared/src/commonMain/resources/assets/values/strings.xml")
 
@@ -207,30 +204,8 @@ abstract class ActuallyPackageAppImageTask: DefaultTask() {
 
         project.logger.lifecycle("Removing unneeded jars")
 
-        val deps: SpMpDeps = project.getDeps()
-        val ffmpeg_version: String = deps.getVersion("org.bytedeco:ffmpeg-platform")
-        val javacpp_version: String = ffmpeg_version.split('-', limit = 2)[1]
-
-        val platforms: List<String> = JarUtil.getUnneededPlatforms(is_windows = false)
-        val jar_prefixes: List<String> = platforms.flatMap { platform ->
-            JarUtil.getUnneededLibraries().map { library ->
-                val version: String =
-                    when (library) {
-                        "javacpp" -> javacpp_version
-                        "ffmpeg" -> ffmpeg_version
-                        else -> throw NotImplementedError(library)
-                    }
-                return@map "$library-$version-$platform"
-            }
-        }
-
-        for (file in dir.resolve("lib/app").listFiles().orEmpty()) {
-            for (prefix in jar_prefixes) {
-                if (file.name.startsWith(prefix) && file.name.endsWith(".jar")) {
-                    file.delete()
-                    project.logger.lifecycle("Removing lib/app/${file.name}")
-                }
-            }
+        with (JarUtil) {
+            dir.resolve("lib/app").removeUnneededJarsFromDir(project)
         }
     }
 
@@ -353,6 +328,33 @@ private object JarUtil {
             }
         )
     }
+
+    fun File.removeUnneededJarsFromDir(project: Project, deps: SpMpDeps = project.getDeps()) {
+        val ffmpeg_version: String = deps.getVersion("org.bytedeco:ffmpeg-platform")
+        val javacpp_version: String = ffmpeg_version.split('-', limit = 2)[1]
+
+        val platforms: List<String> = JarUtil.getUnneededPlatforms(is_windows = false)
+        val jar_prefixes: List<String> = platforms.flatMap { platform ->
+            JarUtil.getUnneededLibraries().map { library ->
+                val version: String =
+                    when (library) {
+                        "javacpp" -> javacpp_version
+                        "ffmpeg" -> ffmpeg_version
+                        else -> throw NotImplementedError(library)
+                    }
+                return@map "$library-$version-$platform"
+            }
+        }
+
+        for (file in this.listFiles().orEmpty()) {
+            for (prefix in jar_prefixes) {
+                if (file.name.startsWith(prefix) && file.name.endsWith(".jar")) {
+                    file.delete()
+                    project.logger.lifecycle("Removing lib/app/${file.name}")
+                }
+            }
+        }
+    }
 }
 
 afterEvaluate {
@@ -362,4 +364,30 @@ afterEvaluate {
     tasks.named<Jar>("packageReleaseUberJarForCurrentOS") {
         with (JarUtil) { excludeUnneededFiles() }
     }
+
+    tasks.withType<AbstractJPackageTask> {
+        doLast {
+            val jars_directory: File = outputs.files.singleFile.resolve("spmp/lib/app")
+            with (JarUtil) {
+                jars_directory.removeUnneededJarsFromDir(project)
+            }
+        }
+    }
+}
+
+tasks.register<Tar>("createReleaseTarball") {
+    val dist_task: Task by tasks.named("createReleaseDistributable")
+    val dist_directory: File = dist_task.outputs.files.singleFile
+    dependsOn(dist_task)
+
+    val platform: String =
+        if (Os.isFamily(Os.FAMILY_WINDOWS)) "windows-x86_64"
+        else "linux-x86_64"
+
+    into("/") {
+        from(dist_directory)
+    }
+
+    archiveFileName = "spmp-v${getString("version_string")}-$platform.tar.gz"
+    compression = Compression.GZIP
 }

flake.nix

@@ -34,21 +34,18 @@
         let
           pname = "spmp";
           version = "0.4.0-RC2";
-
-          src = pkgs.fetchurl {
-            url = "https://github.com/toasterofbread/spmp/releases/download/v${version}/spmp-v${version}-linux-x86_64.appimage";
-            hash = "sha256-zfXyvW5jynx4yD4iOMDAGeKmolhAqiQmpMLtbKBExxs=";
-          };
         in
         pkgs.stdenv.mkDerivation {
           inherit pname version;
 
-          src = pkgs.appimageTools.extract {
-            inherit src pname version;
+          src = pkgs.fetchurl {
+            url = "https://github.com/toasterofbread/spmp/releases/download/v${version}/spmp-v${version}-linux-x86_64.tar.gz";
+            hash = "sha256-yHTRTpYPJcYZmPwWsrYa+t8MWWtLZYCsGTJkQWCr7ho=";
           };
 
           nativeBuildInputs = with pkgs; [
             autoPatchelfHook
+            gnutar
           ];
 
           buildInputs = with pkgs; [
@@ -57,16 +54,18 @@
           ] ++ runtime_packages;
 
           installPhase = ''
-            mkdir -p $out/appimage
-            cp -as $src/bin $out/appimage/bin
-            cp -as $src/lib $out/appimage/lib
+            tar -xzf $src
+
+            mkdir -p $out/dist
+            mv ./bin $out/dist/bin
+            mv ./lib $out/dist/lib
 
             lib_paths=($(echo $NIX_LDFLAGS | grep -oP '(?<=-rpath\s| -L)[^ ]+'))
             lib_paths_str=$(IFS=:; echo "''${lib_paths[*]}")
 
             mkdir -p $out/bin
             echo "#!/bin/sh" >> $out/bin/spmp
-            echo "LD_LIBRARY_PATH=\"$lib_paths_str:\$LD_LIBRARY_PATH\" $out/appimage/bin/spmp" >> $out/bin/spmp
+            echo "LD_LIBRARY_PATH=\"$lib_paths_str:\$LD_LIBRARY_PATH\" $out/dist/bin/spmp" >> $out/bin/spmp
             chmod +x $out/bin/spmp
           '';
         };