diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | cui/Library_cui.mk | 1 | ||||
| -rw-r--r-- | cui/source/dialogs/about.cxx | 5 |
4 files changed, 26 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 05507f355959..f2e4a1df87d9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -420,6 +420,7 @@ export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@ export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_SHELL=@BASH@ +export EXTRA_BUILDID=@EXTRA_BUILDID@ export OOO_VENDOR=@OOO_VENDOR@ export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ diff --git a/configure.ac b/configure.ac index de685d69bdaf..4b518314018a 100644 --- a/configure.ac +++ b/configure.ac @@ -1997,6 +1997,15 @@ AC_ARG_WITH(startcenter-space-bitmap, Usage: --with-startcenter-space-bitmap=/path/my_backing_space.png ],,) +AC_ARG_WITH(extra-buildid, + AS_HELP_STRING([--with-extra-buildid], + [Show addition build identification in about dialog.]) + [ + Usage: --with-extra-buildid="Tinderbox: Win-x86@6, Branch:master, Date:2012-11-26_00.29.34" + ], +,) + + AC_ARG_WITH(vendor, AS_HELP_STRING([--with-vendor], [Set vendor of the build.]) @@ -11996,6 +12005,16 @@ else fi AC_SUBST(STARTCENTER_SPACE_BITMAP) +EXTRA_BUILDID= +AC_MSG_CHECKING([for extra build ID]) +if test -n "$with_extra_buildid" -a "$with_extra_buildid" != "yes" ; then + EXTRA_BUILDID="$with_extra_buildid" + AC_MSG_RESULT([$EXTRA_BUILDID]) +else + AC_MSG_RESULT([not set]) +fi +AC_SUBST(EXTRA_BUILDID) + OOO_VENDOR= AC_MSG_CHECKING([for vendor]) if test -z "$with_vendor" -o "$with_vendor" = "no"; then diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 5c66e71eed8b..ec0c925c688e 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -39,6 +39,7 @@ $(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 0e13ca9e6228..ddc3b46f0f61 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -402,6 +402,11 @@ rtl::OUString AboutDialog::GetVersionString() sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } +#ifdef EXTRA_BUILDID + sVersion += "\n"; + sVersion += EXTRA_BUILDID; +#endif + return sVersion; } |