make --disable-odk the default

Because developers (especially new ones) don't need this, or the
extra dependencies it tends to trigger

Update distro and jenkins configs so that the ones that were building
ODK before, are still building it after this.

Change-Id: I5dc71e70dc457b7921a146008d7d2317b199caab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115647
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-05-15 12:13:12 +02:00
committed by Noel Grandin
parent 13c1e3d1e1
commit b0228e4d39
27 changed files with 32 additions and 6 deletions

View File

@@ -1433,9 +1433,8 @@ libo_FUZZ_ARG_ENABLE(epm,
) )
libo_FUZZ_ARG_ENABLE(odk, libo_FUZZ_ARG_ENABLE(odk,
AS_HELP_STRING([--disable-odk], AS_HELP_STRING([--enable-odk],
[LibreOffice includes an ODK, office development kit which some packagers may [Enable building the Office Development Kit, the part that extensions need to build against])
wish to build without.])
) )
AC_ARG_ENABLE(mpl-subset, AC_ARG_ENABLE(mpl-subset,
@@ -8866,7 +8865,7 @@ AC_SUBST(ENABLE_LWP)
dnl =================================================================== dnl ===================================================================
dnl Check for building ODK dnl Check for building ODK
dnl =================================================================== dnl ===================================================================
if test "$enable_odk" = no; then if test "$enable_odk" != yes; then
unset DOXYGEN unset DOXYGEN
else else
if test "$with_doxygen" = no; then if test "$with_doxygen" = no; then
@@ -8901,7 +8900,7 @@ fi
AC_SUBST([DOXYGEN]) AC_SUBST([DOXYGEN])
AC_MSG_CHECKING([whether to build the ODK]) AC_MSG_CHECKING([whether to build the ODK])
if test "$enable_odk" = "" -o "$enable_odk" != "no"; then if test "$enable_odk" = yes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE ODK" BUILD_TYPE="$BUILD_TYPE ODK"
else else

View File

@@ -34,3 +34,4 @@
--with-package-format=archive --with-package-format=archive
--with-update-config=~/updater.ini --with-update-config=~/updater.ini
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk

View File

@@ -3,3 +3,4 @@
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
--enable-odk

View File

@@ -2,3 +2,4 @@
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
--enable-odk

View File

@@ -26,3 +26,4 @@
--disable-compiler-plugins --disable-compiler-plugins
--disable-gtk3 --disable-gtk3
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk

View File

@@ -1 +1,2 @@
--enable-debug --enable-debug
--enable-odk

View File

@@ -0,0 +1 @@
--enable-odk

View File

@@ -8,3 +8,4 @@
--enable-mergelibs --enable-mergelibs
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-python=fully-internal --enable-python=fully-internal
--enable-odk

View File

@@ -1,2 +1,3 @@
--host=i686-pc-cygwin --host=i686-pc-cygwin
--enable-debug --enable-debug
--enable-odk

View File

@@ -1,2 +1,3 @@
--host=i686-pc-cygwin --host=i686-pc-cygwin
--enable-odk

View File

@@ -1 +1,3 @@
--enable-debug --enable-debug
--enable-odk

View File

@@ -0,0 +1 @@
--enable-odk

View File

@@ -4,3 +4,4 @@
--enable-android-editing --enable-android-editing
CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc
CXX_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/g++ CXX_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/g++
--enable-odk

View File

@@ -6,3 +6,4 @@ COMPILER_PLUGINS_CXX=ccache g++ -std=c++11
--disable-dependency-tracking --disable-dependency-tracking
--disable-split-debug --disable-split-debug
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk

View File

@@ -3,3 +3,4 @@ CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
--enable-kf5 --enable-kf5
--disable-dependency-tracking --disable-dependency-tracking
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk

View File

@@ -1,2 +1,3 @@
--enable-fuzz-options --enable-fuzz-options
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk

View File

@@ -2,3 +2,4 @@
--disable-symbols --disable-symbols
--disable-dependency-tracking --disable-dependency-tracking
--enable-optimized --enable-optimized
--enable-odk

View File

@@ -1,2 +1,3 @@
--with-lang=ALL --with-lang=ALL
--with-jdk-home=/etc/alternatives/java_sdk_11 --with-jdk-home=/etc/alternatives/java_sdk_11
--enable-odk

View File

@@ -1 +1,2 @@
--with-lang=ALL --with-lang=ALL
--enable-odk

View File

@@ -1,2 +1,3 @@
--host=i686-pc-cygwin --host=i686-pc-cygwin
--with-lang=ALL --with-lang=ALL
--enable-odk

View File

@@ -2,3 +2,4 @@
--enable-dbgutil --enable-dbgutil
--disable-symbols --disable-symbols
--disable-dependency-tracking --disable-dependency-tracking
--enable-odk

View File

@@ -26,3 +26,4 @@
--with-hsqldb-jar=/home/coverity/hsqldb.jar --with-hsqldb-jar=/home/coverity/hsqldb.jar
--with-system-rhino --with-system-rhino
--with-rhino-jar=/home/coverity/js.jar --with-rhino-jar=/home/coverity/js.jar
--enable-odk

View File

@@ -4,3 +4,4 @@
--enable-readonly-installset --enable-readonly-installset
--without-java --without-java
--without-system-jars --without-system-jars
--enable-odk

View File

@@ -8,3 +8,4 @@
--with-help=html --with-help=html
--with-myspell-dicts --with-myspell-dicts
--with-package-format=dmg --with-package-format=dmg
--enable-odk

View File

@@ -12,3 +12,4 @@
--with-myspell-dicts --with-myspell-dicts
--with-package-format=msi --with-package-format=msi
--enable-mergelibs --enable-mergelibs
--enable-odk

View File

@@ -12,3 +12,4 @@
--with-myspell-dicts --with-myspell-dicts
--with-package-format=msi --with-package-format=msi
--enable-mergelibs --enable-mergelibs
--enable-odk

View File

@@ -11,3 +11,4 @@
--with-myspell-dicts --with-myspell-dicts
--with-package-format=msi --with-package-format=msi
--enable-mergelibs --enable-mergelibs
--enable-odk