From 38ae1c929f0b60d3eb48d804c6134085b3812a75 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 19 Oct 2021 11:22:29 -0700 Subject: [PATCH] Don't build android to staging --- QGCCommon.pri | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/QGCCommon.pri b/QGCCommon.pri index e993ef3..a6adec4 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -140,7 +140,7 @@ linux|macx|ios { } } -!MacBuild { +!MacBuild:!AndroidBuild { # See QGCPostLinkCommon.pri for details on why MacBuild doesn't use DESTDIR DESTDIR = staging } @@ -164,6 +164,8 @@ exists ($$PWD/.git) { GIT_HASH = $$system(git --git-dir $$PWD/.git --work-tree $$PWD rev-parse --short HEAD) GIT_TIME = $$system(git --git-dir $$PWD/.git --work-tree $$PWD show --oneline --format=\"%ci\" -s HEAD) + message(GIT_DESCRIBE $${GIT_DESCRIBE}) + # determine if we're on a tag matching vX.Y.Z (stable release) contains(GIT_DESCRIBE, v[0-9]+.[0-9]+.[0-9]+) { # release version "vX.Y.Z"