diff options
| author | Corentin Noël <corentin.noel@collabora.com> | 2020-11-17 15:37:52 +0100 |
|---|---|---|
| committer | Corentin Noël <corentin.noel@collabora.com> | 2020-11-18 10:30:43 +0100 |
| commit | 481a0c4cbe3f481e547d802e14bf1a3acfac6a1b (patch) | |
| tree | 1b92e8bd3c33e57b45143c6916d78aab8050efe3 /flatpak | |
| parent | 098a35e7fc54ff02bafb37fb82a270d1885e46d6 (diff) | |
| download | evolution-481a0c4cbe3f481e547d802e14bf1a3acfac6a1b.tar.gz | |
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
Diffstat (limited to 'flatpak')
| -rw-r--r-- | flatpak/org.gnome.Evolution-master.json | 11 | ||||
| -rw-r--r-- | 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", |