From a287e4560d9e4d91d39734181a857a251763b7d3 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Sat, 10 Jun 2023 17:40:13 +0100 Subject: [PATCH 1/2] Remove "wc -l" from Jamulus.pro --- Jamulus.pro | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jamulus.pro b/Jamulus.pro index 1465acab81..0826a218e0 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -251,7 +251,13 @@ win32 { ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64 } ANDROID_VERSION_NAME = $$VERSION - ANDROID_VERSION_CODE = $$system(git log --oneline | wc -l) + # Used by Play Store + ANDROID_VERSION_CODE = 0 + !contains(VERSION, .*dev.*) { + exists(".git/config") { + ANDROID_VERSION_CODE = $$size($$list($$system(git log --format=format:1,lines))) + } + } message("Setting ANDROID_VERSION_NAME=$${ANDROID_VERSION_NAME} ANDROID_VERSION_CODE=$${ANDROID_VERSION_CODE}") # liboboe requires C++17 for std::timed_mutex From e677a74d6b149e86b4641e7991a933508ca1fd82 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Sat, 10 Jun 2023 17:40:13 +0100 Subject: [PATCH 2/2] Remove "wc -l" from Jamulus.pro --- Jamulus.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jamulus.pro b/Jamulus.pro index 0826a218e0..a7cc53e7d0 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -255,7 +255,7 @@ win32 { ANDROID_VERSION_CODE = 0 !contains(VERSION, .*dev.*) { exists(".git/config") { - ANDROID_VERSION_CODE = $$size($$list($$system(git log --format=format:1,lines))) + ANDROID_VERSION_CODE = $$system(git rev-list --count HEAD) } } message("Setting ANDROID_VERSION_NAME=$${ANDROID_VERSION_NAME} ANDROID_VERSION_CODE=$${ANDROID_VERSION_CODE}")