summaryrefslogtreecommitdiff
path: root/solenv/gbuild
AgeCommit message (Collapse)AuthorFilesLines
24 hoursEnable --enable-lto --enable-skia when building with GCC+Clang on LinuxStephan Bergmann8-11/+9
...where all the Library_skia objects are built with Clang, so contain intermediate LLVM bytecode, but were then linked via GCC and ld or gold, which do not understand such object files and thus failed. So in gb_LinkTarget__command_dynamiclink use T_CC/T_CXX also for the linker command line. But then Clang would still be used for linking with the -fuse-ld=(ld or gold) $(USE_LD) suitable for GCC, and would still fail. So break T_USE_LD out of T_LDFLAGS and let gb_LinkTarget_use_clang override T_USE_LD with CLANG_USE_LD. At least for now, that CLANG_USE_LD (containing something like -fuse-ld=lld or -fuse-ld=lld --ld-path=... for the latter see d668c9a04d04d256fcbbd2165fe226f1db88256b "Adapt --enable-ld to Clang 12 trunk --ld-path") needs to manually be passed into autogen.sh, it is not computed in configure.ac. Then building Library_skia would still fail to link against StaticLibrary_libpng, as that only contains intermediate GCC object code, so make sure to build it with -ffat-lto-objects in this specific case. Change-Id: I0a104e53a8898cd9c2eb3b643e21954e853608cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100556 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
6 daysUpdate config.{guess,sub} with latest versions and handle fallout of thatTor Lillqvist2-0/+0
From http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD . This time, do not apply the add-on change from 25a09c8776cc6088a5b2bf13dc84eb386c26bb7e to config.sub, but keep it pristine. Instead, let's start using the name "aarch64" instead of "arm64" for macOS and iOS in the autofoo context, as that is what those tools call it. Clang and Apple call it arm64, though. Change-Id: I1e05866c5fb08e0800cdfeaf7f6a71bfb43d1777 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100272 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
8 daysAdapt --enable-lto to --without-parallelismStephan Bergmann1-1/+1
...which sets PARALLELISM to 0 and thus caused cc1: error: unrecognized argument to ‘-flto=’ option: ‘0’ at least with recent GCC 11 trunk Change-Id: Ifcfb6485c1c2efc8ab798686ca7fc2392d2cfc2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100171 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-07-29Port to FreeBSD aarch64miki1-0/+14
Change-Id: Ib18894db8c2943dd1502c96951545bb75a1944eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91978 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-07-29Add verbose climaker outputJan-Marek Glogowski1-0/+1
If you run gbuild verbose, make climaker output verbose too. Change-Id: I712f156bae33bfd403403675f4e2117282a7079c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99684 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-07-28Adapt --enable-ld to Clang 12 trunk --ld-pathStephan Bergmann1-1/+1
...split from -fuse-ld with <https://github.com/llvm/llvm-project/commit/ 1bc5c84710a8c73ef21295e63c19d10a8c71f2f5> "[Driver] Add --ld-path= and deprecate -fuse-ld=/abs/path and -fuse-ld=rel/path", and now causing warnings (or even errors with -Werror) like '-fuse-ld=' taking a path is deprecated. Use '--ld-path=' instead when --enable-ld is configured as a full path. (--enable-ld was vague whether it supports full paths, but it appeared to work reasonably well at least with old versions of Clang.) Change-Id: I5a7dfd992b56aba78dd3646045fb9a827dc40321 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99569 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-07-17use Clang11's -fpch-instantiate-templates if availableLuboš Luňák1-4/+7
The optimization to instantiate templates already while creating the PCH instead for every single compilation has been finally accepted upstream, but it's opt-in. Change-Id: Ia6456df05512329fc594f9ed0e400250c4f5029e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98948 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-07-10replace usage of whitelist with allowlistThorsten Behrens1-3/+3
Background and motivation: https://tools.ietf.org/html/draft-knodel-terminology-02 [API CHANGE] officecfg::Office::Common::Misc::OpenCLWhiteList -> OpenCLAllowList Change-Id: I65636b19b13e4af1e4851f70e78053f3443d6bb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98181 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-10replace usage of blacklist with denylistThorsten Behrens1-4/+4
.. and a few cases of instead doing blacklist->excludelist where that made more sense. Background and motivation: https://tools.ietf.org/html/draft-knodel-terminology-02 [API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist [API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice [API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-04reduce number of framework librariesNoel Grandin1-1/+0
Change-Id: I18bfdba3d26593f796d8b0bda87720e31066d5e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97968 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-07-04reduce number of framework librariesNoel Grandin1-2/+0
Change-Id: If2bf85301eb1523a636d031f6e5a9f78cb1ee06b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97871 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-29Initial WIP steps for building for macOS on Apple SiliconTor Lillqvist1-0/+13
Don't use $host_os="darwin" for both macOS and iOS depending on $host_cpu. Soon macOS will run on either x86_64 or arm64. Instead, use "darwin" (or "macos") for macOS and "ios" for iOS. Some other early changes for arm64-apple-macos, too. Change-Id: Id89987d854ceba2cd87c6222db2081ccdec0c73e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96976 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-19Make --enable-sal-log orthogonal to --enable-debugStephan Bergmann1-6/+1
...for consistency with other options like --enable-assert-always-abort Change-Id: I3734485e03203aaee065e1435dfd33f980b1b5eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96736 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-11When running make debugrun separately for UITest it needs LANG=CTor Lillqvist1-1/+1
Change-Id: I175ff33704bb1f709a59d53d3e11aa54f45d9b8b
2020-06-10Revert "enable backtraces for unit tests on macos"Noel Grandin1-3/+0
This reverts commit 756c027198adc5212d46d72e0628c90698652af5. Reason for revert: It never did work (was a test), and it cannot work because cores are all stored in /cores under mac, which means we cannot tell which cores belongs to which unit tests, or even if it belongs to the current build on jenkins Change-Id: I866173a41077dbb40d61fb81953d7a92f7d0789e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95888 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-06-03enable backtraces for unit tests on macosNoel Grandin1-0/+3
Change-Id: I4f07e1e7b35bccc217d78662a45ac5eaf5865ee7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95394 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-29add some libs to libmergedNoel Grandin1-0/+8
another small chunk of libs shared by calc/write/impress, doing this in stages in case anything goes wrong. Change-Id: Ie0628e9abd6a78eb3882dcd2030cb5dbcc5490f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95098 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-27tdf#131572 Add java 9 module info for unoloader.jarSamuel Mehrbrodt1-0/+1
Add a java module named "org.libreoffice.unoloader" for this jar. Require this module from org.libreoffice.uno (libreoffice.jar has unoloader.jar in its classpath, so add the same dependency to the modules) Change-Id: I7471d65ac7a0d2c6a11c002027a21f0c441dd1f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94419 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-27tdf#131572 Add java 9 module info for libreoffice.jarSamuel Mehrbrodt3-5/+49
Add a java module named "org.libreoffice.uno" for this jar. This needs to be compiled with Java 9. But since we want to keep b/c with Java 8, the rest of the jar has to be compiled with Java 8. This bumps the *build* requirement to Java 9 while keeping the *runtime* requirement at Java 8. The gbuild JavaClassSet class is changed to invoke javac twice, where the 2nd invocation compiles with --release 9 and a --patch-modules argument so that it finds the results of the first invocation and also the javamaker generated files in CustomTargets. Change-Id: I888f5dbe097cc37136e68db5919939877c981862 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91105 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-05-27Revert "bloaty: use -ffunction-sections and --gc-sections for linking"Noel Grandin1-3/+1
This reverts commit bd39ec554f90badccfb26c843fd0d43237f1b622. Reason for revert: For -ffunction-sections and -fdata-sections, <https://gcc.gnu.org/onlinedocs/gcc-10.1.0/gcc/Optimize-Options.html#Optimize-Options> warns: "Only use these options when there are significant benefits from doing so. When you specify these options, the assembler and linker create larger object and executable files and are also slower. These options affect code generation. They prevent optimizations by the compiler and assembler using relative locations inside a translation unit since the locations are unknown until link time. An example of such an optimization is relaxing calls to short call instructions." Change-Id: I84225ca94de9afff23bdd2913c77095d5d26f7ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94950 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-27bloaty: use -ffunction-sections and --gc-sections for linkingNoel Grandin1-1/+3
strips out 3+ megabytes of duplicate functions (which originate in the generated UNO header files) Change-Id: I69ba5f478b2b062e2b05516bbaa2d18fa8312aa6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94868 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-05-26Drop -I$(dir $(2)) also from gb_*Object__tool_commandStephan Bergmann1-5/+0
...after ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 "-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed" and f218f8f6c8c587d2d78679f935093329f145fede "-I$(dir $(3)) in gb_CObject__command_pattern is no longer needed" had already dropped it from plain gb_CObject__command_pattern. (0349c738da5970d9f0fc10d7cf4d7b766ce10e13 "support for compiler rewriters" had created gb_*Object__tool_command at a time when plain gb_*Object__command still contained those -I arguments, so had presumably just copied them over without a specific additional need to have them in the tool_command variants; and ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 and f218f8f6c8c587d2d78679f935093329f145fede then just failed to also remove them from the tool_command variants.) Presence of the -I arguments in the tool_command variants caused e.g. `make COMPILER_PLUGIN_TOOL=fakebool` to fail with > sw/source/filter/ww8/ww8par.cxx:97:10: error: replace <...> include form with "..." for inclusion of a source file next to the current source file, sw/source/filter/ww8/../../core/inc/DocumentRedlineManager.hxx [loplugin:includeform] > #include <../../core/inc/DocumentRedlineManager.hxx> > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I7ef513507375dcee5d88db53cef58433f7f68e36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94867 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-26use -Xclang -debug-info-kind=constructor if availableLuboš Luňák1-0/+4
The option, available since Clang10, emits debuginfo for classes with explicit ctors only together with the ctor, which avoids redundant debuginfo for such classes, noticeably saving both build time and disk space. https://reviews.llvm.org/D72427 I've been using this for quite some time, without problems. Change-Id: I24e5339f983cb8d8990185436dd63e00f0d3ce60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94756 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-05-07no longer force -arch:SSE on WindowsLuboš Luňák1-5/+5
SSE2 has been pretty much a requirement for running Windows since about 2018, so there should be ~nobody needing this. https://lists.freedesktop.org/archives/libreoffice/2020-May/085029.html Change-Id: I579eb92c18e42c57aa1421b889cfa7997b84915f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93558 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt2-2/+2
This moves the classes from juh.jar and ridl.jar to libreoffice.jar The goal is to have one single jar (and Java module, will be added later) which developers can include to work with LO. juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar on its classpath to keep backwards compatibility. This is a continuation of ae855bf48163ff64d94cfc34aff8e37abdb5518d and a preparation to have Java 9 module support. Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-05Disable -Wstringop-overflow in --enable-optimized builds with GCCStephan Bergmann1-0/+3
This reverts commit e287fde52fb9de5bdf1d00c8a3fbfcca7db9892c "Silence bogus -Wstringop-overflow with GCC trunk towards GCC 10", as that workaround, which happened to work for some revisions of GCC trunk towards GCC 10, no longer works for GCC 10 release candidates, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92893#c9> "[10 Regression] Unhelpful -Wstringop-overflow warning for a trailing one-element array". (Using -Wstringop-overflow=1 instead of the -Wstringop-overflow=2 default would have still caused bogus warnings, requiring -Wno-stringop-overflow.) Change-Id: I9b7342748c18da32f509b4a0e0653aede8447657 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93499 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-21CLANG_C -> CLANG_CCLuboš Luňák1-4/+4
Change-Id: I50ed05116df3f295af6406f0ee45610d9e1e031e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92619 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-21don't try to use -fno-enforce-eh-specs with ClangLuboš Luňák2-2/+10
The use can be triggered when using gb_LinkTarget_use_clang, but Clang unlike GCC doesn't know the option. Change-Id: Idd109a09127061a72940de9229f0dd34b221375d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92611 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-20prefer building Skia with Clang if possible (tdf#131697)Luboš Luňák8-17/+54
I.e. try to find and use Clang even if the default compiler is something else. Skia is optimized to be built with Clang(-cl) and in CPU-based raster mode some operations are several times slower if built with something else (e.g. fmax/fmin do not get optimized to inline assembly). It is enough to select Clang to be installed in the MSVS installer. At this point it unclear how to handle release binaries, if it should work this way and enforced, or maybe Clang could be used for building everything, or maybe some other way. Change-Id: I6b95a0f2d5cbf176942d9e01136990b14be6dba8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92415 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-17move LIBO_LANG=C setting to gb_TEST_ENV_VARSRene Engelhard1-1/+3
... since it is an environment variable after all (and without it timeout $(gb_UITest_COMMAND) doesn't work). Change-Id: I898e4b90070f3f4883a707fc88c99e98bc039d9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92060 Tested-by: Jenkins Tested-by: Rene Engelhard <rene@debian.org> Reviewed-by: Rene Engelhard <rene@debian.org>
2020-04-09pyuno,*: kill Python 2 support with fireMichael Stahl1-2/+0
Python 2 support was retained for use with --enable-python=system on RHEL7 and SLES. The time has arrived to remove it. Some .py files that were imported from third parties are not changed to enable easier replacement with updated versions if necessary. solenv/gdb should continue to support Python 2. bin/get-bugzilla-attachments-by-mimetype requires Python 2 to access Launchpad. Change-Id: I26414ae8e9f8402c90336af82020135685694217 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91697 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-04-06lxml: try to remove some quirky PYPATH stuffMichael Stahl1-1/+1
In RepositoryExternal.mk, a system python automatically gets $PYPATH added to $PYTHONPATH, but the internal one does not - this doesn't make sense. Try to remove it for system-case by fixing the one case that relies on it and for which it was introduced in commit 84ef6d82546b044990f4efd57e51e29c6c6565c8 to directly extend $PYTHONPATH instead, which ought to work as long as it's not evaluated at global scope and thereby avoids affecting all python invocations. Change-Id: I4534f2be92b850dc01193cb1bb2e0a299a5152be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91748 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-04-06use full path for the PCH .hxx file for MSCLuboš Luňák2-3/+6
Microsoft cl.exe actually doesn't care, but clang-cl without this complains that it cannot find the .hxx file for the PCH. Change-Id: Ic2db94f2323ddb884ea71e6ac6554cc0a5ab682a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91744 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-03tdf#131835: don't set PYTHONWARNINGS=error if --enable-werror isn't setRene Engelhard1-1/+1
python 3.8 at least throws DeprecationWarnings for imp->importlib and some FutureWarnings. Allow to disable as for the build warnings-are-errors. Change-Id: Id5ada39f960f014108f2584e3e333741f6345acd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91623 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins Tested-by: Rene Engelhard <rene@debian.org>
2020-03-31tdf#130911: convert desktop-translate from Perl to Python.Jussi Pakkanen1-3/+5
Change-Id: Ic0a84f4e46f4bc3312d15a31ea16060851302d2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90847 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-03-30Override gb_Package_get_target,python3 also for gb_UITest_DEPS on macOSStephan Bergmann1-0/+4
...same as gb_CppunitTest_PYTHONDEPS and gb_PythonTest_DEPS. (This is just one piece of the puzzle of making uicheck work on macOS eventually.) Change-Id: I88ec602e2924f37ef4b3cd143fd8487ba25fcb8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91358 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-03-27revert the gyp-based nss build changesLuboš Luňák1-1/+1
https://lists.freedesktop.org/archives/libreoffice/2020-March/084769.html etc. This reverts commit c76fdcf1cfa1242e66b50ebe80d6eac1baae37a9. This reverts commit 10f52ab4d27263439d59f55f40e88ad2fde0cf71. This reverts commit eac806e8dcd9ee6439ac8695978ff6b62cc6b8d2. This reverts commit d591a682e46ff352f06a61c024ef661dd17f4ea4. This reverts commit 12235d3390a7fc5146bf65f9d6166034b8a048ee. This reverts commit 23245f723fb29262b8543d6447d1b0bb69cb50fb. This reverts commit 91658b402b66b67c785687d5b3a76e3183fe76bf. This reverts commit 5feadfad0cc3be2680213d2e5f6f786b2f4cc74f. This reverts commit fecca49c309fc723c524f12fa671114b316a5562. This reverts commit c6a9454e744289cf2004b42b3c90854b2db8382b. This reverts commit a1a62a70411cb6041b5930ead08280d5e1e7b5f9. This reverts commit 8512f4ca090c85477a6670438aeefe7fdfcf8a98. This reverts commit 532ffb7a297d55b495141ce33692df5d9917b54f. Change-Id: Iaa48d692bea2ca2468cdd5f8ad26ad91c0c31dde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91199 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-03-23do not reset PATH when invoking internal pythonLuboš Luňák1-1/+1
Change-Id: I7759fefbf5c2dbc39ae9a53f7c044bf63165608c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90116 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-23rework the default make targetLuboš Luňák2-9/+6
The current default target ('all') was a confusing mess, it did run some tests, but it did run just some of them and it also depended on some factors (toplevel 'make' vs module 'make'). And running tests on plain 'make' also makes the developer cycle longer, which is annoying, and now there's Jenkins which will do checks. This commit makes the default make target to be 'build'. All the other targets should work the same way, with the exception of 'all', which I've removed (given that it was confusing, it's probably better not to try to keep any kind of backwards compatibility there). The 'build-nocheck' target is now equal to 'build' and thus pointless, but I've kept it for backwards compatibility. Change-Id: I874b7ae8d26e95efa86a00dd32cfa7fd19599b9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89820 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-03-23configure,gbuild: gla11y fails on Fedora 31Michael Stahl2-2/+2
The problem is that the LD_LIBRARY_PATH on the command line causes /usr/bin/python to find LO's libpython*.so*: 18269: find library=libpython3.7m.so.1.0 [0]; searching 18269: search path=.../instdir/program (LD_LIBRARY_PATH) 18269: trying file=.../instdir/program/libpython3.7m.so.1.0 Presumably LD_LIBRARY_PATH is used to find bundled libxml/libxslt. So let's try to disable the broken case where a bundled lxml is used with system python and bundled libxml/libxslt; this cannot work. (regression from 84ef6d82546b044990f4efd57e51e29c6c6565c8) Change-Id: I67aa8250691cae8f899d65f674aa9da23a9d1d7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90906 Reviewed-by: Samuel Thibault <sthibault@hypra.fr> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-03-16make python warnings in our UITests error earlyNoel Grandin1-0/+1
rather than erroring only on some of the buildbots (in particular one of the daily buildbots seems to have this on by default) And fix a invalid escape sequence we discover in the process. Change-Id: Icd62dae2959e5117dec8949ce55dd484503fc446 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90565 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-11Revert "Revert "add some libs to libmerged""Noel Grandin1-0/+11
This reverts commit b8077713987253f6db0887ddad56fd6871374a8b. Reason for revert: Change-Id: I09b7d548a674fc8b2991be00616a7e95ec7d1444 sberg:You can probably reverts this again, as <https://ci.libreoffice.org/job/lo_daily_tb_win/162/> now succeeded with <https://gerrit.libreoffice.org/plugins/gitiles/core/+/9ed75e2c65544b4f71c73e1c51a68d74e31d544b%5E!/> "Properly use createOneInstanceComponentFactory for javaloader". Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90275 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-06tdf#130911: convert some token generation scripts from Perl to Python.Jussi Pakkanen1-2/+3
Change-Id: Id655b6a0cee7bdfe4804941f20fe358af8f3185e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89477 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-03Revert "add some libs to libmerged"Noel Grandin1-11/+0
This reverts commit 4ec76bdeeb000881cf46c78166dc02badb4f44db. Revert this for now to get the TB77 builds working again. Change-Id: I345ad54b5bc8e8a06dfba539c2cee8822a350f93 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89802 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-28gb_Package_get_clean_target must rm recursivelyStephan Bergmann1-1/+1
...so that e.g. `make Package_infoplist.clean` on macOS does not fail with > rm: instdir/LibreOffice.app/Contents/Resources/en.lproj: is a directory Change-Id: I41c74ef118eeae567f88affed073d4e65f9d1bb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89696 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-28tdf#130809: Fix adding empty Contents/Resources/en.lproj into installation setsStephan Bergmann1-1/+1
...after 1fc85d03c46cedda136986fd6df7fe862893414b "Revert 'Make font-based unit test depend on instdir fonts'" accidentally broke cabadfc288e5e7324723c62f36b918a80db90323 "Introduce gb_Package_add_empty_directories" Change-Id: I077fe3f23c3b76797850577cb9e5ef519080a072 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89694 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-28macOS: don't sign executables earlyChristian Lohmaier1-9/+3
macOS 10.14 and later (Mojave & Catalina) will treat signed exectuables as "restricted binary" and in turn will block any use of DYLD_LIBRARY_PATH settings, causing the build to fail with e.g.: dyld: Library not loaded: @__VIA_LIBRARY_PATH__/libuno_sal.dylib.3 Referenced from: /Users/cloph/build/workdir/LinkTarget/Executable/genconv_dict Reason: unsafe use of relative rpath @__VIA_LIBRARY_PATH__/libuno_sal.dylib.3 in /Users/cloph/build/workdir/LinkTarget/Executable/genconv_dict with restricted binary Change-Id: Ia90d8fa6f28f9a2c10f6b46eb1796e2730550119 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/81599 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-02-26add some libs to libmergedNoel Grandin1-0/+11
another small chunk of libs shared by calc/write/impress, doing this in stages in case anything goes wrong. Change-Id: Ica162828565e825b8eaeb223eb3ab132880a6279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89166 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-25fix --enable-mergedlibs buildNoel Grandin1-2/+2
after my recent additions to the list of libs exceeded Windows command line length limit (mostly affecting those people whose workspace was under a fairly long folder name) Change-Id: I4d60e9704db49f0a3f562200b737879fba7ee5a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89420 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-20add macOS malloc debugging env varsNoel Grandin1-0/+1
which would have saved me some time when debugging a recent macOS issue. Change-Id: I370826501db14fc563b553428f480f50bde48f9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89056 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>