config_host/config_buildconfig.h.in | 8 ++++++++ configure.ac | 4 ++++ desktop/source/lib/init.cxx | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit cbfac11330882c7d0a817b6c37a08b2ace2b66f4 Author: Andras Timar <[email protected]> AuthorDate: Mon Oct 10 23:38:56 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Mon Nov 7 20:35:46 2022 +0100 Send build config (configure options) in LOKit version info JSON Change-Id: I29a6cca467e5f1e9ba59528edefbb397ceb81780 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141197 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Aron Budea <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141494 Tested-by: Jenkins Reviewed-by: Andras Timar <[email protected]> diff --git a/config_host/config_buildconfig.h.in b/config_host/config_buildconfig.h.in new file mode 100644 index 000000000000..0c93d6e02f84 --- /dev/null +++ b/config_host/config_buildconfig.h.in @@ -0,0 +1,8 @@ +/* Options passed to configure script */ + +#ifndef CONFIG_BUILDCONFIG_H +#define CONFIG_BUILDCONFIG_H + +#define BUILDCONFIG "" + +#endif diff --git a/configure.ac b/configure.ac index b4b9a7a24eb7..9a445fefabc1 100644 --- a/configure.ac +++ b/configure.ac @@ -522,6 +522,8 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH) LIBO_THIS_YEAR=`date +%Y` AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR) +AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$ac_configure_args"]],[Options passed to configure script]) + dnl =================================================================== dnl Product version dnl =================================================================== @@ -14830,6 +14832,8 @@ AC_CONFIG_FILES([config_host.mk instsetoo_native/util/openoffice.lst sysui/desktop/macosx/Info.plist vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in]) + +AC_CONFIG_HEADERS([config_host/config_buildconfig.h]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_box2d.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 6414a3fe1ca9..6008820da1bb 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_buildconfig.h> #include <config_features.h> #include <stdio.h> @@ -6539,7 +6540,8 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/) "\"ProductName\": \"%PRODUCTNAME\", " "\"ProductVersion\": \"%PRODUCTVERSION\", " "\"ProductExtension\": \"%PRODUCTEXTENSION\", " - "\"BuildId\": \"%BUILDID\" " + "\"BuildId\": \"%BUILDID\", " + "\"BuildConfig\": \"" BUILDCONFIG "\" " "}")); }
