[evolution/gnome-3-38] M!71 - flatpak: Allow to build a flatpak with a different build directory

[Milan Crha <mcrha src gnome org>]

commit 564e0d7e10f03d868ab063ed4be527646a5ee9b2
Author: Corentin Noël <corentin noel collabora com>
Date:   Tue Nov 17 15:37:52 2020 +0100

    M!71 - flatpak: Allow to build a flatpak with a different build directory
    
    Reorganize the code so that we can have a different source and build directory.
    
    Notably make it work out of the box in GNOME Builder.
    
    Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/71

 flatpak/org.gnome.Evolution-master.json | 11 ++++++++---
 flatpak/org.gnome.Evolution-stable.json | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 737405ca4a..a59c8f2ecc 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -346,7 +346,13 @@
                                                "cp config.h.in config.h.in.orig",
                                                "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| 
\\(flatpak git$(git log --pretty=format:%h --max-count=1)\\)|\" >config.h.in"
                                        ]
-                               },
+                               }
+                       ]
+               },
+               {
+                       "name": "flatpak-evolution-wrapper",
+                       "buildsystem": "simple",
+                       "sources": [
                                {
                                        "type": "script",
                                        "commands": [
@@ -399,14 +405,13 @@
                                        "dest-filename": "flatpak-evolution-fix-service-names.sh"
                                }
                        ],
-                       "post-install": [
+                       "build-commands": [
                                "./flatpak-evolution-fix-service-names.sh <flatpak-evolution-wrapper.sh.in 
> flatpak-evolution-wrapper.sh",
                                "chmod a+x flatpak-evolution-wrapper.sh",
                                "mv /app/bin/evolution /app/bin/evolution.bin",
                                "cp flatpak-evolution-wrapper.sh /app/bin/evolution"
                        ]
                },
-
                {
                        "name": "evolution-ews",
                        "buildsystem": "cmake-ninja",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 4086087b96..017a6a8534 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -345,7 +345,13 @@
                                                "cp config.h.in config.h.in.orig",
                                                "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| 
\\(flatpak git$(git log --pretty=format:%h --max-count=1)\\)|\" >config.h.in"
                                        ]
-                               },
+                               }
+                       ]
+               },
+               {
+                       "name": "flatpak-evolution-wrapper",
+                       "buildsystem": "simple",
+                       "sources": [
                                {
                                        "type": "script",
                                        "commands": [
@@ -398,14 +404,13 @@
                                        "dest-filename": "flatpak-evolution-fix-service-names.sh"
                                }
                        ],
-                       "post-install": [
+                       "build-commands": [
                                "./flatpak-evolution-fix-service-names.sh <flatpak-evolution-wrapper.sh.in 
> flatpak-evolution-wrapper.sh",
                                "chmod a+x flatpak-evolution-wrapper.sh",
                                "mv /app/bin/evolution /app/bin/evolution.bin",
                                "cp flatpak-evolution-wrapper.sh /app/bin/evolution"
                        ]
                },
-
                {
                        "name": "evolution-ews",
                        "buildsystem": "cmake-ninja",