Kaydet (Commit) 28cc89aa authored tarafından Petr Mladek's avatar Petr Mladek

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
üst 1138f52d
...@@ -387,7 +387,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ ...@@ -387,7 +387,6 @@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
export nodep=@nodep@ export nodep=@nodep@
@x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@ @x_OBJCFLAGS@ export OBJCFLAGS=@OBJCFLAGS@
@x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@ @x_OBJCXXFLAGS@ export OBJCXXFLAGS=@OBJCXXFLAGS@
export EXTRA_BUILDID=@EXTRA_BUILDID@
export OBJDUMP=@OBJDUMP@ export OBJDUMP=@OBJDUMP@
export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@ export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@
export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@ export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@
......
/*
Optional Build ID displayed in the about dialog
*/
#ifndef CONFIG_BUILDID_H
#define CONFIG_BUILDID_H
#undef EXTRA_BUILDID
#endif
...@@ -12115,7 +12115,7 @@ if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then ...@@ -12115,7 +12115,7 @@ if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then
else else
AC_MSG_RESULT([not set]) AC_MSG_RESULT([not set])
fi fi
AC_SUBST(EXTRA_BUILDID) AC_DEFINE_UNQUOTED([EXTRA_BUILDID], ["$EXTRA_BUILDID"])
OOO_VENDOR= OOO_VENDOR=
AC_MSG_CHECKING([for vendor]) AC_MSG_CHECKING([for vendor])
...@@ -12539,6 +12539,7 @@ if test -f config_host.mk; then ...@@ -12539,6 +12539,7 @@ if test -f config_host.mk; then
fi fi
AC_CONFIG_FILES([config_host.mk Makefile lo.xcent instsetoo_native/util/openoffice.lst]) 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_clang.h])
AC_CONFIG_HEADERS([config_host/config_features.h]) AC_CONFIG_HEADERS([config_host/config_features.h])
AC_CONFIG_HEADERS([config_host/config_folders.h]) AC_CONFIG_HEADERS([config_host/config_folders.h])
......
...@@ -23,7 +23,6 @@ $(eval $(call gb_Library_add_defs,cui,\ ...@@ -23,7 +23,6 @@ $(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \ $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
$(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \ $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \ $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
$(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\""$(EXTRA_BUILDID)"\") \
)) ))
$(eval $(call gb_Library_use_custom_headers,cui,\ $(eval $(call gb_Library_use_custom_headers,cui,\
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <sfx2/sfxuno.hxx> #include <sfx2/sfxuno.hxx>
#include <sfx2/sfxcommands.h> #include <sfx2/sfxcommands.h>
#include "about.hxx" #include "about.hxx"
#include <config_buildid.h>
#include <sfx2/sfxdefs.hxx> #include <sfx2/sfxdefs.hxx>
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment