callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M!71 - flatpak: Allow to build a flatpak with a different build directory

Browse Source 
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
This commit is contained in:
Corentin Noël
2020-11-17 15:37:52 +01:00
committed by Milan Crha
parent fe2bc1c50a
commit 564e0d7e10
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flatpak/org.gnome.Evolution-master.json
View File

@ -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",

11
flatpak/org.gnome.Evolution-stable.json
View File

@ -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",