[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - ios/CustomTarget_iOS_setup.mk

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Sep 19 16:20:03 UTC 2019


 ios/CustomTarget_iOS_setup.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 363034400918d1e17a03e16a458045e6db3efcd2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 27 00:41:04 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Sep 19 18:19:20 2019 +0200

    Fill buildid in versionrc for iOS with the git HEAD hash
    
    Previously it tried to use a BUILDID Make variable that did not exist.
    
    Change-Id: Idaf8076fac0a39fc3805c4445de2b41b55044c1a
    Reviewed-on: https://gerrit.libreoffice.org/79135
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 923e6546e5ba..3032b957f7b5 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -105,7 +105,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	(echo '[Version]' \
 	&& echo 'AllLanguages=en-US' \
 	&& echo 'BuildVersion=' \
-	&& echo "buildid=$(BUILDID)" \
+	&& echo "buildid=$(shell git -C $(SRCDIR) log -1 --format=%H)" \
 	    ) > $(IOSRES)/program/versionrc
 
 	$(SRCDIR)/bin/lo-all-static-libs | sed -e 's/ /\


More information about the Libreoffice-commits mailing list