Kaydet (Commit) 4497b12f authored tarafından Petr Mladek's avatar Petr Mladek

add --with-extra-buildid configure option

It can be used to show extra build indentification in the about dialog
just under the version string.

The plan is to show information about tinderboxes and make the life easier
for QA guys.

Change-Id: I4714a34cf13492c7bb92798b4b6d11385093f223
üst c8fb25f2
......@@ -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@
......
......@@ -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
......
......@@ -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))
......
......@@ -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;
}
......
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