diff options
author | Petr Mladek <pmladek@suse.cz> | 2013-08-29 13:14:29 +0200 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-08-29 11:51:20 +0000 |
commit | ea316c964a8e4405ccbfdd0f27b5e07ede2c5239 (patch) | |
tree | b5e23923fac18518e0cdd830f0f0eec95396b8ce | |
parent | 9000d1960d0ceae77ed236dc7c821a591f468fe3 (diff) |
make the tinderbox information more reliable in the about dialog (fdo#58034)
Pass the information via config_host/config_buildid.h. Then
cui/source/dialogs/about.cxx will get rebuilt also in the incremental build.
Change-Id: I058cbe162e7015cbea6c71253c20db097477708f
Reviewed-on: https://gerrit.libreoffice.org/5677
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | config_host/config_buildid.h.in | 10 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | cui/Library_cui.mk | 1 | ||||
-rw-r--r-- | cui/source/dialogs/about.cxx | 1 |
5 files changed, 13 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 48667ca8b4be..9268c7b942a0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -368,7 +368,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ export nodep=@nodep@ @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ -export EXTRA_BUILDID=@EXTRA_BUILDID@ export OBJDUMP=@OBJDUMP@ export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@ export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@ diff --git a/config_host/config_buildid.h.in b/config_host/config_buildid.h.in new file mode 100644 index 000000000000..04f03b83543a --- /dev/null +++ b/config_host/config_buildid.h.in @@ -0,0 +1,10 @@ +/* +Optional Build ID displayed in the about dialog +*/ + +#ifndef CONFIG_BUILDID_H +#define CONFIG_BUILDID_H + +#undef EXTRA_BUILDID + +#endif diff --git a/configure.ac b/configure.ac index fd531de9bd2e..1d5acd21271a 100644 --- a/configure.ac +++ b/configure.ac @@ -11485,7 +11485,7 @@ if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then else AC_MSG_RESULT([not set]) fi -AC_SUBST(EXTRA_BUILDID) +AC_DEFINE_UNQUOTED([EXTRA_BUILDID], ["$EXTRA_BUILDID"]) OOO_VENDOR= AC_MSG_CHECKING([for vendor]) @@ -11900,6 +11900,7 @@ if test -f config_host.mk; then fi AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst]) +AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) AC_CONFIG_HEADERS([config_host/config_features.h]) AC_CONFIG_HEADERS([config_host/config_global.h]) diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index ade10e44f98f..987481b0f1a2 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -21,7 +21,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_custom_headers,cui,\ diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index ee943f8f4092..73fe04ebc5d5 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -42,6 +42,7 @@ #include <sfx2/sfxuno.hxx> #include <sfx2/sfxcommands.h> #include "about.hxx" +#include <config_buildid.h> #include <sfx2/sfxdefs.hxx> #include <sfx2/app.hxx> #include <rtl/ustrbuf.hxx> |