Updated template for manifest

Audiveris · Mar 17, 2024 · f6597c3 · f6597c3
1 parent d23480f
commit f6597c3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -367,7 +367,7 @@ task genFlatpakManifest() {
                 def binding = [:]
                 binding.OPEN_JDK        = "openjdk$minJavaVersion"
                 binding.GRADLE_ZIP      = 'gradle-8.5-all.zip'
-                binding.GRADLE_SHA256   = 'bfcdff0229a801e5efd43d312cffb1b0aa24574b4a2f1beed1c751fadbcd44da'
+                binding.GRADLE_SHA256   = 'c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b'
                 binding.TAG             = '5.4-alpha-1'
                 expand(binding)
             }
@@ -385,7 +385,10 @@ task buildFlatpak(type: Exec) {
     dependsOn('flatpakGradleGenerator')
     onlyIf {"linux" == "$hostOSName"}
 
-    println "Running flatpak-builder"
+    doFirst {
+        println "Running flatpak-builder"
+    }
+
     workingDir('dev/flathub')
     commandLine('flatpak-builder', '--force-clean', 'build', 'org.audiveris.audiveris.yml')
 }
diff --git a/dev/flathub b/dev/flathub
diff --git a/dev/flatpak/org.audiveris.audiveris.txt b/dev/flatpak/org.audiveris.audiveris.txt
@@ -3,7 +3,7 @@
 # Variables names and example values:
 # - OPEN_JDK:       openjdk21
 # - GRADLE_ZIP:     gradle-8.5-all.zip
-# - GRADLE_SHA256:  bfcdff0229a801e5efd43d312cffb1b0aa24574b4a2f1beed1c751fadbcd44da
+# - GRADLE_SHA256:  c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
 # - TAG:            5.4-alpha
 # ----
 
@@ -63,23 +63,30 @@ modules:
 
       # Extract lib and bin from Audiveris .tar to /app
       - tar x -C /app --strip-components=1 -f build/distributions/Audiveris-*.tar
+
       # Insert TESSDATA_PREFIX in Audiveris sh file
       - sed -i -f add-tessdata-prefix.sed /app/bin/Audiveris
     sources:
+      # Audiveris project. We provide the tag only, not the commit value
       - type: git
         url: https://github.com/Audiveris/audiveris
         tag: ${TAG}
+
       - type: file
         url: https://services.gradle.org/distributions/${GRADLE_ZIP}
         sha256: ${GRADLE_SHA256}
+
       - type: file
         path: org.audiveris.audiveris.desktop
+
       - type: file
         path: org.audiveris.audiveris.metainfo.xml
+
       - type: file
         path: add-tessdata-prefix.sed
-      - type: file
-        # Include dependencies.json, generated by Gradle task flatpakGradleGenerator
+
+      # Include dependencies.json, generated by Gradle task flatpakGradleGenerator
       - dependencies.json
-        # Include lang_sources.yml, manually generated via languages.sh
-      - lang_sources.yml
+
+      # Include lang_sources.yml, manually generated via languages.sh
+      - lang_sources.yml