diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-01-12 09:35:26 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-01-12 11:06:46 +0100 |
| commit | 4f1eef278c41997315860158d481d4fc37bd328b (patch) | |
| tree | 2016ed7b7504765321020c5300b39d927e07787c /android/Bootstrap | |
| parent | 723b6a07e4c4dfb8fdafc186041557514b014014 (diff) | |
android: show version / buildid in about dialog
Note that getPackageName() also throws NameNotFoundException, so in the
unlikely situations in case:
- package info (class containing the package version) is not found or
- the package version is not in an "a/b" form
We still just don't show anything.
Also, mark the new TextView as android:textIsSelectable, so it's
possible to copy&paste the version for bugreport purposes.
Change-Id: I63b53cca4126da17bfbda0293d7c98e8524ef41a
Diffstat (limited to 'android/Bootstrap')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 82513df68d1a..ee50d1f331f4 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -180,8 +180,9 @@ copy-stuff: echo '[Version]' > assets/program/versionrc echo 'AllLanguages=en-US' >> assets/program/versionrc echo 'BuildVersion=' >> assets/program/versionrc - echo 'buildid=dead-beef' >> assets/program/versionrc + echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' >> assets/program/versionrc echo 'ReferenceOOoMajorMinor=4.1' >> assets/program/versionrc + sed -i 's|android:versionName=".*"|android:versionName="$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)/$(shell cd $(SRCDIR) && git log -1 --format=%H)"|' AndroidManifest.xml # # .res files mkdir -p assets/program/resource |