[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 26 22:20:34 UTC 2018


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

New commits:
commit 27e517b2e592d8516844848a85399c6ed05f18aa
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 27 00:07:02 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Nov 27 00:09:26 2018 +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: Ie31eb3928c69dc52fcb17a9a5593cbe166d95307

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 642c6d969c77..539f3856ad5e 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -100,7 +100,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