[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - ios/CustomTarget_iOS_setup.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 26 22:42:22 UTC 2018
ios/CustomTarget_iOS_setup.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5c99b38190249ae86d5d8f6023a074fa67024b02
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 27 00:41:04 2018 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Nov 27 00:41:04 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: Idaf8076fac0a39fc3805c4445de2b41b55044c1a
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 4de69c94e6ab..7c09103a6de4 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -80,7 +80,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
echo '[Version]' > $(IOSRES)/program/versionrc
echo 'AllLanguages=en-US' >> $(IOSRES)/program/versionrc
echo 'BuildVersion=' >> $(IOSRES)/program/versionrc
- echo "buildid=$(BUILDID)" >> $(IOSRES)/program/versionrc
+ 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