blob: 72594f6b77b21c14b5687472159d51cf27d4ae60 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
Upstream merge-request: https://git.sailfishos.org/mer-core/libresource/merge_requests/5
From 5d4625173c64dec352548f262159da33d8030b1a Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 25 Mar 2020 13:49:33 +0100
Subject: [PATCH] Never run git commands when .tarball-version exists
This makes it work in environments where the building takes place in a
git repo, but libresource is still built from a release tarball
---
build-aux/git-version-gen | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 819fa04..7769787 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -129,18 +129,21 @@ fi
v=`echo "$v" |sed 's/^v//'`
-# Don't declare a version "dirty" merely because a time stamp has changed.
-git status > /dev/null 2>&1
+if [ ! -f $tarball_version_file ]
+then
+ # Don't declare a version "dirty" merely because a time stamp has changed.
+ git status > /dev/null 2>&1
-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-case "$dirty" in
- '') ;;
- *) # Append the suffix only if there isn't one already.
- case $v in
- *-dirty) ;;
- *) v="$v-dirty" ;;
- esac ;;
-esac
+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+ case "$dirty" in
+ '') ;;
+ *) # Append the suffix only if there isn't one already.
+ case $v in
+ *-dirty) ;;
+ *) v="$v-dirty" ;;
+ esac ;;
+ esac
+fi
# We default to 0.0.0 instead of UNKNOWN
if test "x$v" = "xUNKNOWN"; then
--
2.23.0
|
