Use of Flatpak resources to populate flathub

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "flathub"]
-	path = dev/flathub
+[submodule "flatpak/flathub"]
+	path = flatpak/flathub
 	url = https://github.com/flathub/org.audiveris.Audiveris

app/build.gradle

@@ -97,6 +97,7 @@ allprojects {
 
 // Run default configuration.
 // Heap size (and other stuff) can be modified via a 'jvmLineArgs' on gradle command line
+// Application arguments can be provided via a 'cmdLineArgs' on gradle command line
 run {
     minHeapSize = '512m'
     maxHeapSize = '1g'
@@ -361,7 +362,7 @@ def depsFile = file('build/dependencies.json')
 tasks.flatpakGradleGenerator {
     description("Collect all dependencies for Flatpak")
     outputFile = depsFile
-    downloadDirectory = '../app/build/dependencies'
+    downloadDirectory = 'dependencies'
 
     outputs.file(depsFile)
     doFirst { println "app. Generating dependencies" }

flatpak/README.md

@@ -22,6 +22,8 @@ Below is a simplified tree view, focused on the main source files.
 .
 ├── app
 │   ├── build.gradle
+│   ├── build
+│   │   └── ... dependencies.json
 │   ├── dev
 │   │   ├── icons
 │   │   │   └── ... // many .png icon images
@@ -36,7 +38,7 @@ Below is a simplified tree view, focused on the main source files.
 │   └── src
 │       └── ... // a whole tree of main and test .java files
 ├── dev // this folder could be removed?
-│   ├── flathub // a Git submodule
+│   ├── flathub // the old Git submodule
 │   │   └── ...
 │   ├── flatpak // no longer used
 │   │   ├── ...
@@ -45,13 +47,17 @@ Below is a simplified tree view, focused on the main source files.
 │   │   └── create-flatpak-dependencies.py
 │   └── icon-50.gif
 ├── flatpak
+│   ├── README.md // this file!
 │   ├── build.gradle
 │   ├── dev
-│   │   ├── add-tessdata-prefix.sed
 │   │   └── org.audiveris.audiveris.template.yml
-│   ├── org.audiveris.audiveris.desktop
-│   ├── org.audiveris.audiveris.metainfo.xml
-│   └── README.md // this file!
+│   └── flathub // the new Git submodule
+│       ├── add-tessdata-prefix.sed                 
+│       ├── org.audiveris.audiveris.desktop         
+│       ├── org.audiveris.audiveris.metainfo.xml    
+│       ├── ... lang_sources.yml            // generated by task genLanguages
+│       ├── ... org.audiveris.audiveris.yml // generated by task genManifest
+│       └── ... dependencies.json           // generated by task genDependencies
 ├── gradle
 │   └── wrapper
 │       ├── gradle-wrapper.jar

flatpak/build.gradle

@@ -17,8 +17,9 @@ plugins {
     id 'base'
 }
 
-def app     = project(':app')
-def appDir  = app.projectDir
+def app         = project(':app')
+def appDir      = app.projectDir
+def flathubDir  = new File(project.projectDir.getAbsolutePath() + "/flathub")
 
 // SHA1 computation
 // Stolen from https://gist.github.com/dagezi/9594839#file-calcsha1-gradle
@@ -37,14 +38,13 @@ task genLanguages {
     description("Generate languages sources")
 
     doLast {
-        println "Generating language sources"
-        def outputDir = layout.buildDirectory.get().asFile
-        outputDir.exists() || outputDir.mkdirs()
-        def langFile = new File(outputDir, "lang_sources.yml")
-
-	project.delete(
-	    fileTree(langFile)
-	)
+        ///flathubDir.exists() || flathubDir.mkdirs()
+        def langFile = new File(flathubDir, "lang_sources.yml")
+        println "Generating language sources into ${langFile}"
+
+        project.delete(
+            fileTree(langFile)
+        )
 
         fileTree("$appDir/dev/tessdata").include('*.traineddata').each { f ->
             def relPath = relativePath(f).replace("\\","/")
@@ -72,6 +72,14 @@ task genDependencies {
 
     FileCollection sharedFiles = configurations.getByName("sharedConfiguration")
     inputs.files(sharedFiles)
+
+    doLast {
+        println "Copying dependencies.json"
+        copy {
+            from('../app/build/dependencies.json')
+            into(flathubDir)
+        }
+    }
 }
 
 // Generate the Flatpak manifest by expanding key variables
@@ -97,30 +105,47 @@ task genManifest {
                 binding.TAG = '5.4-alpha-2'
                 expand(binding)
             }
-            into('build')
+            into(flathubDir)
             rename '.template', ''
         }
     }
 }
 
+// Initialize flatpak/flathub content before build
+task initFlathub {
+    description("Populate flathub submodule")
+    dependsOn('genLanguages')
+    dependsOn('genDependencies')
+    dependsOn('genManifest')
+
+    doLast {
+        println "Copying resources to flathub"
+        copy {
+            from('res')
+            into(flathubDir)
+        }
+    }
+}
+
 // Build flatpak on manifest
 task buildFlatpak (type: Exec) {
     description("Run flatpak-builder on manifest")
-    dependsOn('genLanguages')
-    dependsOn('genManifest')
-    dependsOn('genDependencies')
+    dependsOn('initFlathub')
+
     onlyIf { app.ext.hostOSName == "linux" }
 
     doFirst {
-        println "Running flatpak-builder in folder $projectDir"
+        println "Running flatpak-builder in folder flatpak/flathub"
     }
 
-    // flatpak-builder is run from the subproject directory
+    // flatpak-builder is run from the flathub directory
+    workingDir 'flathub'
+
     // All outputs are located under the 'build' directory for an easier cleanup
     commandLine('flatpak-builder', 
-        '--verbose', 
-        '--state-dir=build/.flatpak-builder',   // option to define the state-storing directory
+//        '--verbose', 
+//        '--state-dir=build/.flatpak-builder',   // option to define the state-storing directory
         '--force-clean',                        // option to empty the output directory
-        'build/output',                         // relative path to the output directory to write
-        'build/org.audiveris.audiveris.yml')    // relative path to the manifest file to read
+        'build',                                // relative path to the output directory to write
+        'org.audiveris.audiveris.yml')          // relative path to the manifest file to read
 }