[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - config_host/config_buildconfig.h.in configure.ac desktop/source

[Andras Timar (via logerrit)]

 config_host/config_buildconfig.h.in |    8 ++++++++
 configure.ac                        |    3 +++
 desktop/source/lib/init.cxx         |    4 +++-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 4eab641ae38d3d91c6beb50ddbb77b1fa7ec0be2
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Oct 10 23:38:56 2022 +0200
Commit:     Aron Budea <aron.bu...@collabora.com>
CommitDate: Wed Oct 12 02:02:45 2022 +0200

    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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Aron Budea <aron.bu...@collabora.com>

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 7b855a5e89a3..65126c1caee5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,6 +463,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 ===================================================================
@@ -14706,6 +14708,7 @@ AC_CONFIG_FILES([config_host.mk
                  instsetoo_native/util/openoffice.lst
                  sysui/desktop/macosx/Info.plist
                  
vs-code-template.code-workspace:.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 4eed88331948..559c8fe9cd1b 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>
@@ -6504,7 +6505,8 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER 
LibreOfficeKit* /*pThis*/)
         "\"ProductName\": \"%PRODUCTNAME\", "
         "\"ProductVersion\": \"%PRODUCTVERSION\", "
         "\"ProductExtension\": \"%PRODUCTEXTENSION\", "
-        "\"BuildId\": \"%BUILDID\" "
+        "\"BuildId\": \"%BUILDID\", "
+        "\"BuildConfig\": \""  BUILDCONFIG  "\" "
         "}"));
 }