strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make --disable-odk the default

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

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

1
distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
View file

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

1
distro-configs/Jenkins/Linux_dev_master.conf
View file

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

1
distro-configs/Jenkins/Linux_rel_master.conf
View file

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

1
distro-configs/Jenkins/Linux_ubsan_master.conf
View file

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

1
distro-configs/Jenkins/MacOSX_dev_master.conf
View file

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

1
distro-configs/Jenkins/MacOSX_rel_master.conf
View file

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

1
distro-configs/Jenkins/PerfSuite_Linux.conf
View file

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

1
distro-configs/Jenkins/Win32_dev_master.conf
View file

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

1
distro-configs/Jenkins/Win32_rel_master.conf
View file

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

2
distro-configs/Jenkins/Win64_dev_master.conf
View file

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

1
distro-configs/Jenkins/Win64_rel_master.conf
View file

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

1
distro-configs/Jenkins/android_common.conf
View file

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

1
distro-configs/Jenkins/linux_clang_dbgutil_64
View file

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

1
distro-configs/Jenkins/linux_gcc_release_64
View file

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

1
distro-configs/Jenkins/linux_random.conf
View file

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

1
distro-configs/Jenkins/macosx_clang_dbgutil
View file

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

1
distro-configs/Jenkins/screenshot_linux.conf
View file

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

1
distro-configs/Jenkins/screenshot_mac.conf
View file

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

1
distro-configs/Jenkins/screenshot_win.conf
View file

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

1
distro-configs/Jenkins/windows_msc_dbgutil_32
View file

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

1
distro-configs/LibreOfficeCoverity.conf
View file

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

3
distro-configs/LibreOfficeHaiku.conf
View file

@ -3,4 +3,5 @@
--with-boost-libdir=/system/develop/lib
--enable-readonly-installset
--without-java
--without-system-jars
--without-system-jars
--enable-odk

1
distro-configs/LibreOfficeMacOSX.conf
View file

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

1
distro-configs/LibreOfficeWin32.conf
View file

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

1
distro-configs/LibreOfficeWin64.conf
View file

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

1
distro-configs/LibreOfficeWinArm64.conf
View file

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