diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-12 10:30:19 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-13 10:57:02 +0100 |
| commit | 93b4928dddf9cdd55450450995fefe324d771221 (patch) | |
| tree | 09b8166c277680281e41995b859cd2e4cfa28d27 /desktop | |
| parent | 285a3e8d8b77b44da3dcc767877f878fe0e0493e (diff) | |
Re-introduce build config to version info reported by LOK
... as an opt-in --with-buildconfig-recorded configure option.
This allows to have the data in the admin console, as implemented in
commit cbfac11330882c7d0a817b6c37a08b2ace2b66f4 (Send build config
(configure options) in LOKit version info JSON, 2022-11-07), when
reprobuilds are not required. The default is no build config, which
is compatible with reprobuilds.
This reverts commit 389def871853c885289627452f40b3ae0a8dabc8.
Change-Id: I7f0be489a1c82268d0ca38cb761843c9d432a14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159344
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 3283cf7731e5..3ee743d4aada 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -12,6 +12,7 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> +#include <config_buildconfig.h> #include <config_cairo_rgba.h> #include <config_features.h> @@ -7242,8 +7243,11 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/) "\"ProductName\": \"%PRODUCTNAME\", " "\"ProductVersion\": \"%PRODUCTVERSION\", " "\"ProductExtension\": \"%PRODUCTEXTENSION\", " - "\"BuildId\": \"%BUILDID\" " - "}"_ustr)); + "\"BuildId\": \"%BUILDID\"" +#if BUILDCONFIG_RECORDED + ", \"BuildConfig\": \"" BUILDCONFIG "\"" +#endif + " }"_ustr)); } static void aBasicErrorFunc(const OUString& rError, const OUString& rAction) |