[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - configure.ac distro-configs/NISZ_32.conf distro-configs/NISZ_64.conf

[Gabor Kelemen (via logerrit)]

 configure.ac                |    2 +-
 distro-configs/NISZ_32.conf |   32 ++++++++++++++++++++++++++++++++
 distro-configs/NISZ_64.conf |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)

New commits:
commit fd233dbf4e996ed1cb73c7883d2829c4b9560853
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Wed Jan 6 17:27:47 2021 +0100
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Thu Jun 10 15:43:12 2021 +0200

    Add our own distro config files and first version bump
    
    Change-Id: I70ad2e17184fdfc6bf82fba09be2f8a7fe8d6951
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108879
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116994

diff --git a/configure.ac b/configure.ac
index 986664f5e7f4..cdb8ee28d510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[7.1.4.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.4.2-N1],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
diff --git a/distro-configs/NISZ_32.conf b/distro-configs/NISZ_32.conf
new file mode 100644
index 000000000000..eef085b982c6
--- /dev/null
+++ b/distro-configs/NISZ_32.conf
@@ -0,0 +1,32 @@
+# NISZ Windows 32-bit config
+
+--enable-pch
+--without-junit
+--enable-extension-integration
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-nlpsolver
+--with-myspell-dicts
+--enable-mergelibs
+--disable-ext-wiki-publisher
+--disable-online-update
+--disable-breakpad
+--disable-odk
+--disable-firebird-sdbc
+--with-help
+--enable-release-build
+--disable-cve-tests
+--with-package-format=msi
+--without-helppack-integration
+
+# NISZ build
+--with-vendor=NISZ Zrt.
+--with-lang=en-US hu de fr it ru hr sk pl ro
+
+--with-visual-studio=2019
+--with-windows-sdk=10.0
+
+# machine settings
+#--with-parallelism=4
+#--with-ucrt-dir=$core/../../packages/WindowsUCRT
+#--with-jdk-home=$core/../../../ojdk-32
diff --git a/distro-configs/NISZ_64.conf b/distro-configs/NISZ_64.conf
new file mode 100644
index 000000000000..8f55d2e6eeff
--- /dev/null
+++ b/distro-configs/NISZ_64.conf
@@ -0,0 +1,33 @@
+# NISZ Windows 64-bit config
+
+--enable-pch
+--without-junit
+--enable-extension-integration
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-nlpsolver
+--with-myspell-dicts
+--enable-mergelibs
+--disable-ext-wiki-publisher
+--disable-online-update
+--disable-breakpad
+--disable-odk
+--disable-firebird-sdbc
+--with-help
+--enable-release-build
+--disable-cve-tests
+--with-package-format=msi
+--without-helppack-integration
+--enable-64-bit
+
+# NISZ build
+--with-vendor=NISZ Zrt.
+--with-lang=en-US hu de fr it ru hr sk pl ro
+
+--with-visual-studio=2019
+--with-windows-sdk=10.0
+
+# machine settings
+#--with-parallelism=4
+#--with-ucrt-dir=$core/../../packages/WindowsUCRT
+#--with-jdk-home=$core/../../../ojdk-32