diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-08-29 15:41:59 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-29 16:56:35 +0200 |
| commit | e372338807be890f02ae5d7eb56c795df3516c71 (patch) | |
| tree | a3ee1ba745ebcbd50a1e52222488628826576348 /cui | |
| parent | 2f684f3de4f356bc570d279a392a6afe862314c3 (diff) | |
make the tinderbox information more reliable in the about dialog (fdo#58034)
Pass the information via config/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.
Also allow to set EXTRA_BUILDID also via environment variable. This is much
easier with tinderboxed that work with static autogen.input.
Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74
Reviewed-on: https://gerrit.libreoffice.org/5680
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/Library_cui.mk | 1 | ||||
| -rw-r--r-- | cui/source/dialogs/about.cxx | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index b367ad1be29f..c9c00a98041a 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_defs,cui,\ $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \ $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ - $(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\""$(EXTRA_BUILDID)"\") \ )) $(eval $(call gb_Library_use_sdk_api,cui)) diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index b70754fdb88b..a7ddbb4cf62d 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -48,6 +48,7 @@ #include <sfx2/sfxcommands.h> #include "about.hxx" #include "about.hrc" +#include <config_buildid.h> #include <sfx2/sfxdefs.hxx> #include <sfx2/app.hxx> #include <rtl/ustrbuf.hxx> @@ -489,10 +490,11 @@ rtl::OUString AboutDialog::GetVersionString() sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } -#ifdef EXTRA_BUILDID - sVersion += "\n"; - sVersion += EXTRA_BUILDID; -#endif + if (strlen(EXTRA_BUILDID) > 0) + { + sVersion += "\n"; + sVersion += EXTRA_BUILDID; + } return sVersion; } |