Merge branch 'development'

Author: hbitteur

.github/workflows/flatpak.yml

@@ -46,39 +46,32 @@ jobs:
   flatpak:
     name: "Flatpak"
     needs: java-dependencies
-    runs-on: ubuntu-latest
 
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-47
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
       options: --privileged
 
     strategy:
       matrix:
-        arch: [x86_64, aarch64]
+        variant:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
       fail-fast: false
+    runs-on: ${{ matrix.variant.runner }}
 
     steps:
       - name: download flathub content
         uses: actions/download-artifact@v4
         with:
           name: flathub-content
 
-      - name: Install docker
-        if: ${{ matrix.arch != 'x86_64' }}
-        run: |
-          dnf -y install docker
-
-      - name: Set up QEMU
-        if: ${{ matrix.arch != 'x86_64' }}
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: arm64
-
       - name: Build flatpak ${{ github.sha }}
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           build-bundle: true
           bundle: org.audiveris.audiveris.flatpak
           manifest-path: org.audiveris.audiveris.yml
           cache-key: audiveris-flatpak-${{ github.sha }}
-          arch: ${{ matrix.arch }}
+          arch: ${{ matrix.variant.arch }}

README.md

@@ -67,11 +67,9 @@ as described in the handbook [sources section][sources].
 
 There are two main branches in the Audiveris project:
 - the `master` branch is the GitHub default branch;
-we use it for releases, and only for them;  
-To build from this branch, you will need a `jdk` for Java version **24** or higher.
+we use it for releases, and only for them.
 - the `development` branch is the one where all developments continuously take place;
-Periodically, when a release is to be made, we merge the development branch into the master branch;  
-As of this writing, the source code on development branch requires a `jdk` for Java version **24**.
+Periodically, when a release is to be made, we merge the development branch into the master branch.
 
 See details in the [Wiki article][workflow] dedicated to the chosen development workflow.
 

app/build.gradle

@@ -22,7 +22,7 @@ plugins {
 def app = project(':app')
 
 // Central location for application version
-project.version = '5.7.1'
+project.version = '5.8.0'
 println "version: ${project.version}"
 
 // Central location for the specific versions of tesseract dependencies
@@ -195,6 +195,12 @@ sourceSets {
     }
 }
 
+test {
+    // Test classes not meant for Junit
+    exclude '**/org/audiveris/omr/jaxb/basic/**'
+    exclude '**/org/audiveris/omr/jaxb/facade/**'
+}
+
 //-------
 // Tasks
 //-------
@@ -270,54 +276,79 @@ jar {
     }
 }
 
-// Retrieve the full hash for the latest commit from Git
+// Retrieve hash of the latest commit from Git
+// Output is in 'app.ext.commit' property
 tasks.register('getCommit', Exec) {
-    description = "Retrieves full hash of git latest commit"
-    outputs.file("build/commit.txt")
-    commandLine = "git rev-parse HEAD".split(' ')
+    description = "Retrieves hash of git latest commit"
+    // NOTA: We exclude the folder '<root>/flatpak/flathub' from this commit retrieval
+    commandLine = "git log -n1 --pretty=%H -- :^../flatpak/flathub".split(' ')
     standardOutput = new ByteArrayOutputStream()
 
     doLast {
         def commit = standardOutput.toString().replaceAll('\n', '')
-        println "commit: ${commit}"
+        println "app. New commit: ${commit}"
         app.ext.commit = commit
-
-        def commitFile = file("build/commit.txt")
-        commitFile.text = commit
     }
 }
 
-// Retrieve the short hash for the latest commit from Git
-tasks.register('getCommitShort', Exec) {
-    description = "Retrieves short hash of git latest commit"
-    outputs.file("build/commitShort.txt")
+tasks.register('createBuildFolder') {
+    description = "Make sure the 'build' folder exists"
+    doLast {
+        def dir = file('build')
+        if (!dir.exists()) {
+            dir.mkdirs()
+            println "app. Directory created: ${dir}"
+        } else {
+            println "app. Directory already exists: ${dir}"
+        }
+    }
+}
 
-    commandLine = "git rev-parse --short HEAD".split(' ')
-    standardOutput = new ByteArrayOutputStream()
+// Compare commit with the one used for the generation of ProgramId Java class
+tasks.register('checkCommit') {
+    dependsOn 'getCommit'
+    dependsOn 'createBuildFolder'
 
     doLast {
-        def commitShort = standardOutput.toString().replaceAll('\n', '')
-        println "commitShort: ${commitShort}"
+        def cache = file("build/commit.properties")
+
+        if (cache.exists()) {
+            def props = new Properties()
+            cache.withInputStream { props.load(it) }
+            app.ext.oldCommit = props.getProperty('commit')
+            println "app. Old commit: ${app.ext.oldCommit}"
+            if (!app.ext.oldCommit.equals(app.ext.commit)) {
+                app.ext.commitChanged = 'true'
+            }
+        } else {
+            println "app. No old commit"
+            app.ext.commitChanged = 'true'
+        }
+
+        if (project.hasProperty('commitChanged')) {
+            // Save the new value
+            def properties = new Properties()
+            properties.setProperty('commit', app.ext.commit)
+
+            cache.withOutputStream { out ->
+                properties.store(out, ' Last commit value')
+            }
 
-        def commitShortFile = file("build/commitShort.txt")
-        commitShortFile.text = commitShort
+            println "app. Properties written to disk: ${cache}"            
+        }
     }
 }
 
 // Generate a 'ProgramId.java' source file, based on Git data
 tasks.register('generateProgramId') {
     group = "build"
     description = "Generates the ProgramId source"
-    dependsOn 'getCommit'
-    dependsOn 'getCommitShort'
-
-    inputs.file("build/commit.txt")
-    inputs.file("build/commitShort.txt")
+    dependsOn 'checkCommit'
+    onlyIf { project.hasProperty('commitChanged') }
 
     def outputDir = file("build/generated-src/org/audiveris/omr")
     def className = "ProgramId"
     def gSrc = new File(outputDir, "${className}.java")
-    outputs.file(gSrc)
 
     doLast {
         outputDir.exists() || outputDir.mkdirs()
@@ -326,7 +357,7 @@ tasks.register('generateProgramId') {
         gSrc.append(" * This code has been automatically generated by Gradle.\n */\n")
         gSrc.append("public abstract class $className {")
 
-        app.ext.programBuild = file('build/commitShort.txt').text.trim()
+        app.ext.programBuild = app.ext.commit
         ["company_name", "company_id", "program_name", "program_id", "program_version", "program_build", "tessdata_tag"].each { str ->
             def strParts = str.split("_")
             def propName = strParts[0] + strParts[1].capitalize()
@@ -335,6 +366,8 @@ tasks.register('generateProgramId') {
         }
 
         gSrc.append("}\n")
+
+        println "app. Java class ProgramId generated"
     }
 }
 compileJava.dependsOn('generateProgramId')

app/res/basic-classifier.zip

@@ -31,16 +31,16 @@ public abstract class Annotations
     //~ Static fields/initializers -----------------------------------------------------------------
 
     /** File name extension for whole book annotations: {@value}. */
-    public static final String BOOK_ANNOTATIONS_EXTENSION = "-annotations.zip";
+    public static final String BOOK_ANNOTATIONS_EXTENSION = ".annotations.zip";
 
     /** File name extension for single sheet annotations: {@value}. */
-    public static final String SHEET_ANNOTATIONS_EXTENSION = "-annotations.xml";
+    public static final String SHEET_ANNOTATIONS_EXTENSION = ".annotations.xml";
 
     /** File format for single sheet image: {@value}. */
     public static final String SHEET_IMAGE_FORMAT = "png";
 
     /** File name extension for single sheet image: {@value}. */
-    public static final String SHEET_IMAGE_EXTENSION = "-image." + SHEET_IMAGE_FORMAT;
+    public static final String SHEET_IMAGE_EXTENSION = "." + SHEET_IMAGE_FORMAT;
 
     //~ Constructors -------------------------------------------------------------------------------