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 <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141494 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
parent
ff5783bf66
commit
cbfac11330
3 changed files with 15 additions and 1 deletions
8
config_host/config_buildconfig.h.in
Normal file
8
config_host/config_buildconfig.h.in
Normal file
|
@ -0,0 +1,8 @@
|
|||
/* Options passed to configure script */
|
||||
|
||||
#ifndef CONFIG_BUILDCONFIG_H
|
||||
#define CONFIG_BUILDCONFIG_H
|
||||
|
||||
#define BUILDCONFIG ""
|
||||
|
||||
#endif
|
|
@ -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])
|
||||
|
|
|
@ -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 "\" "
|
||||
"}"));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue