summaryrefslogtreecommitdiff
path: root/Makefile.in
AgeCommit message (Collapse)Author
2021-07-19Avoid bash'ism (comment in line continuation)Stephan Bergmann
bash appears to remove comments only up to the next line-continuation backslash/newline pair, while SUS mandates that the "<backslash> and <newline> shall be removed before splitting the input into tokens", and at least zsh 5.8 follows that interpretation and thus complained about a `then` not followed by a `fi` Change-Id: Ifedb002f133a7bc4f79bb9bec3e8c97ccc704aaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119227 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-17don't ignore dump_syms errors during symbol extractionChristian Lohmaier
also fix the file filtering in case directories are passed for recursive traversal (pdb files are not created in instdir, so that never really matched our build-env) Pass a directory to the invocation to make use of that filtering, and also add a retry in case dump_syms segfaults during processing (see also 73299faa75a4974eb49c93ffdfb2d6329cb4e519) Change-Id: I8989c3fd72de0b18eecce490fac81db956f87515 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117386 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-06-11use freshly compiled dump_syms.exe on windows for symbolinfo extractionChristian Lohmaier
while self compiled one still segfaults frequently, it is a tad better than the included one (and compiling froms source instead of using precompiled binaries is a net win in any case) Out of 50 attempts with the mergedlo.dll, the new compiled dump_syms succeeded 11 times, the shipped one succeeded 7 times - so could still be regular variance in that small sample size, but at least not significantly worse either. Change-Id: I86c213fe6aece58f1391d4c2bf9906b85eee9c57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117056 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-06-01Remove config.warn during `make distclean`Stephan Bergmann
57f7b8f86bcd29b71e6d5f2990536eec64beeb05 "configure: Keep warnings file and cat build ones" insinuates that it shall no longer be removed during configure, so at least remove it during distclean Change-Id: Ic74aa0f2ca26887f90fea70d764b89b85a1cb01d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116513 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-01Better keep these $(BUILDDIR)/config.* lines sorted lexicographicallyStephan Bergmann
...after 16b48021e12641fbba4320f70e06ae0462f1995f "Fix cross-compilation 'make distclean'" Change-Id: I544f43adf5603cfd6f704429abad7055e7061058 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116510 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-05-25Install GDB pretty printers into cross-toolsetJan-Marek Glogowski
Change-Id: Id42dd694514e104d03c649a19788b5c192ec35a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116116 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-05-22ofz build fixCaolán McNamara
Change-Id: Ia8c0aacc57a6aa2dd1ba591fd3a95c61d84e617b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115990 Tested-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-05Run checks also on cross build toolchainJan-Marek Glogowski
- certainly those can break subtly too Change-Id: Iade2b8d78c1ffe43cfb260e4cdbe15adb4332765 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114563 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-04-10use systemd-detect-virt to detect building as root in containerCaolán McNamara
Drop the older container detection attempts because they are not reliable to detect being run as root in a container in github actions. <cloph> https://github.com/google/oss-fuzz/issues/4093#issuecomment-656290094 "It appears some GitHub actions are run with docker.service (where docker is in /proc/self/cgroup) while the zstd actions are run with containerd.service where /proc/self/cgroup looks like […]" <cloph> https://github.com/google/oss-fuzz/pull/4101 → probably also just use systemd-detect-virt instead of the grepping ourselves... if we're root and systemd-detect-virt doesn't exist or it claims we're not in a container then continue to abort the build using LIB_FUZZING_ENGINE for the oss-fuzz specific case worked fine, but lets try something a little more generic. Change-Id: I59711b01dfcd052b5af899ad41ae5890f849eacb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113738 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-07skip check-if-root test if LIB_FUZZING_ENGINE is setCaolán McNamara
https://github.com/google/oss-fuzz/pull/5588/checks?check_run_id=2285987092 Where presubmit checks for oss-fuzz fail with Makefile:62: recipe for target 'check-if-root' failed despite the efforts made to detect running inside a container LIB_FUZZING_ENGINE is set by oss-fuzz which builds LibreOffice by calling bin/oss-fuzz-build.sh which uses distro-configs/LibreOfficeOssFuzz.conf that enables --enable-fuzzers and --enable-fuzzers ensures LIB_FUZZING_ENGINE is set, so checking for LIB_FUZZING_ENGINE seems a reasonable test here to skip the root check Change-Id: I930c87c13bd365b0adbefd3625598a89e48468ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113731 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-18Library_gie no longer existsCaolán McNamara
Change-Id: I1e786496c07b503010ca412879e405ca77007d32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111164 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-12fix fuzzer buildCaolán McNamara
Change-Id: I41df4af812cd225a0bd8e49df9e8b3c322698d28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110825 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-12-16Add generated vs-code-template.code-workspace to distcleanStephan Bergmann
Change-Id: I4e8cc80db2f2c4f90e732f163e33c3324ca25a7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107825 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-11-21Allow --enable-macosx-sandbox without the codesigning identitiesTor Lillqvist
For cases where you just want "make test-install" to construct an app bundle that you will manipulate and then sign separately. Change-Id: Iad805618f74ec783ebc013a664f928511b388383 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106185 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106260 Tested-by: Jenkins
2020-09-11Fix the minimal build-tools targetJan-Marek Glogowski
The revert commits change the build-tools target for a DESKTOP build to build the complete LO. This restores the original, minimal one and also adds a whitelist of allowd build types. OpenCL needs a configure switch, as it's status is also stored in a config header, so preventing the build is not enough. This also reverts: - commit 802161a505272732566210e9ebbd8fe1b23fb86d - commit 02d931a59e2966d0c2736db8dee7be3e3dcd6bae Change-Id: Ibfcb0c54e72da1b7c2e63c082ea6586520a787fa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102480 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-07-17Update paths in Makefile.in and android/.gitignoreMichael Weghorn
commit 0dffc65236fbacf98047d6dbfc82b4efe7dd959b Date: Fri Jun 5 08:59:26 2020 -0400 android: fix the build output directory had changed the output directory, so adapt the paths in .gitignore and Makefile.in accordingly. Change-Id: I9c145e359e20167185ae2f7b055fa3b1dac870f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98971 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2020-07-06When cross-compiling to DESKTOP, just make "build" for the build platformTor Lillqvist
Trying to fine-tune that exactly what is needed but nothing else is built is very painful. For instance, on macOS, if you build gengal but not soffice, you end up with this error when trying to run the built gengal, because there is no Info.plist in the app bundle in instdir_for_build: "No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting" Change-Id: I63d766f0e7e72f55454d16c72c32e153cf976443 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98177 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-04reduce number of framework librariesNoel Grandin
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-17allow building as root inside a container without complaintCaolán McNamara
add a check for $container Change-Id: Ib6921c6d771622fb5f4acb82d10aa6fb34e1bbac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96538 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-05-18Revert "make: map slowcheck to gbuild's build and slowcheck"Luboš Luňák
This does not actually ensure everything is built before tests are run, so this doesn't fix the test failures it was intended to fix. This reverts commit 4054a30e2b2fa254dfb20718ce757ceb2f638fd5. Change-Id: Ie0fb9f98f90aeb6fc3ecf373efe9dadb6e2a5c39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92589 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-05-04Adapt to hardened_runtime.xcentStephan Bergmann
...generated since 88453fd13a653963b394b8f865ff104b5545f137 "Enable debugging of a hardened process on macOS" Change-Id: I061b3673855d6e44f0fbf805f8cda1a9ee6f2196 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93431 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-21ofz#21701 Fuzzing build failureCaolán McNamara
Change-Id: I4a8042f4f3c117a2268b06789a99cf0ba6dbc3f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92608 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-20Revert "Revert "make: map slowcheck to gbuild's build and slowcheck""Luboš Luňák
Jenkins Mac buildbots still haven't been updated to use explicit make targets instead of plain 'make'. This reverts commit 59d0a42639b5e569890ae00a2deef620c4e5c258.
2020-04-20Revert "make: map slowcheck to gbuild's build and slowcheck"Luboš Luňák
This does not actually ensure everything is built before tests are run, so this doesn't fix the test failures it was intended to fix. This reverts commit 4054a30e2b2fa254dfb20718ce757ceb2f638fd5. Change-Id: Id0a81179327d42a7b608a67813db53ca7a5c71d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90788 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-03-23rework the default make targetLuboš Luňák
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-19make: map slowcheck to gbuild's build and slowcheckMiklos Vajna
This is meant to to fix the Jenkins Windows/macOS buildbots after they started to run 'make unitcheck slowcheck'. Change-Id: I128448ca3a190969c0cc0f02d2c27bc0a373129b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90765 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-03-02dtoa needed by salCaolán McNamara
Change-Id: I79067b047384425c65a2653b20e637d8461cf7f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89780 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-04allow root under podmanCaolán McNamara
Change-Id: I66dc674aab8dc86c95495754400c5e64b2583599 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86223 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-07Makefile comments need to start in the first columnTor Lillqvist
This "comment" was actually interpreted as a shell command. Sure, the "command" was a comment in shell, too, but still, quite pointless to run it. Change-Id: If5abeabb1c10d62fa90dcdaf81b3b54af958ba62 Reviewed-on: https://gerrit.libreoffice.org/79292 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit d7cbe885daf2e05677b2891c920e5ff125ee15a9)
2019-06-17Add vs2019-ide-integrationMike Kaganski
Change-Id: I14b7ebb3521f9a23fcf4c3ff907408327f189f29 Reviewed-on: https://gerrit.libreoffice.org/74138 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-04-25That bin directory should no longer be thereStephan Bergmann
...at least since 7a08bfeabe21193e04b9747a831653efcfc63190 "tdf#122244 Put InfoPlist.strings files at correct places on macOS", though it wasn't under Contents/ at least as of lately, anyway. The code to remove it had been added with f345a2c52af0333b46b4b74e686883c8cb9ffab4 "We don't want those bin/InfoPlist_*.zip files in the app bundle". I don't know how to do a --enable-macosx-code-signing build on macOS to verify that it can indeed be removed, though. Change-Id: I61d91bd47abf8f4b5d9e117d9943e0682ebef2cb Reviewed-on: https://gerrit.libreoffice.org/71298 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2018-12-18No more need to generate lo.xcent from lo.xcent.inStephan Bergmann
...after fd34a19b4d8ccbd8740cf6056be87b8c267caaec "Seems that we don't need the com.apple.application-identifier after all" dropped the last @...@ replacement there Change-Id: Id6f4d1065b28be12e5d727bab553daa17fc4dfcb Reviewed-on: https://gerrit.libreoffice.org/65275 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-30No ios/generated folder is created any longerTor Lillqvist
The generated files for iOS are now in workdir/CustomTarget/ios. Change-Id: Idee3902eaabf21aa7dacb971ad81f4e2c7df3b5b
2018-11-29Rename Mac OS X to official name macOS in comments and documentationBartosz Kosiorek
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95 Reviewed-on: https://gerrit.libreoffice.org/64102 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-11-28Let distclean remove all of generated config_build/ treeStephan Bergmann
Change-Id: I8d12454003c0bd23170007e30f96016b47820f5f Reviewed-on: https://gerrit.libreoffice.org/64157 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-01gbuild: rename value OS=IOS to OS=iOSMichael Stahl
This gets rid of the horrible hack in gbuild.mk to accomodate the case-incorrect iOS platform makefiles that cannot be renamed without upsetting git on file systems that sadly lack the case sensitivity feature. Keep the macro defined to IOS though. Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234 Reviewed-on: https://gerrit.libreoffice.org/62705 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2018-09-10Work around "find: The environment is too large for exec()" errors on WindowsStephan Bergmann
...similar to df9edbcd2883cec2d0596133131cfbc220dee91f 'Work around 'xargs: environment is too large for exec' errors on Windows" Change-Id: I50bc5c73b84e2d8e7adc70f72f9af2d23a0b3b36 Reviewed-on: https://gerrit.libreoffice.org/60241 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-09-05improve error message when building as rootNoel Grandin
Change-Id: I496e439e2f7e24c05f798f1a7ed0081ca0725f5c Reviewed-on: https://gerrit.libreoffice.org/60037 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Jenkins
2018-08-30Upgrade to vs2017-ide-integration, since we don't support VS2015 in masterMike Kaganski
This allows to avoid the "(Visual Studio 2015)" labels next to project names in Solution Explorer; and also avoid multiple warnilgs like project-name.vcxproj : warning : The build tools for Visual Studio 2015 (v140) cannot be found. Install Visual Studio 2015 (v140) to build using the Visual Studio 2015 (v140) build tools. in IDE's Output pane in case VS2015 is absent locally. Change-Id: I53b68ac810cbf2a31667c35dd549310e7209e010 Reviewed-on: https://gerrit.libreoffice.org/59797 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-08-16reenable the rest of the fuzzersCaolán McNamara
Change-Id: I84050caa6f606a4a41724620ac5fe716a2a56fb9
2018-08-16reenable another bunch of fuzzersCaolán McNamara
Change-Id: Ibee698f8dcc79e1599e9790fb6710f80e22821c3
2018-08-13restore a few fuzzersCaolán McNamara
Change-Id: I6ded1a204d9140eea6d79df3d40a1874a87bd3d0
2018-08-13Removed duplicated testAndrea Gelmini
Change-Id: I06954db80884532d04550609c83623fd5ec5c8bc Reviewed-on: https://gerrit.libreoffice.org/58598 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-07disable even more fuzzersCaolán McNamara
Change-Id: Ieba632453d7a5f9d1881c01aa81445db9a7158e8 Reviewed-on: https://gerrit.libreoffice.org/58674 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-05still not enough space on oss-fuzzCaolán McNamara
Change-Id: I159704ff44193943ecd354dd159db795d76ae2d8 Reviewed-on: https://gerrit.libreoffice.org/58628 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-04oss-fuzz out of spaceCaolán McNamara
Change-Id: Iaf671453d513689deb651261c5bba813305fb234 Reviewed-on: https://gerrit.libreoffice.org/58590 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-05-08Makefile: re-run configure when download.lst changesMichael Stahl
This can only break currently when the ODFVALIDATOR_JAR (or officeotron) changes, but then it does break and you get an outdated odfvalidator.sh. Change-Id: Idcdea3abe6516b71943f32c2bd412f79dc44d790 Reviewed-on: https://gerrit.libreoffice.org/53993 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-04-21gbuild: add target rules for all modulesSamuel Thibault
This allows to run e.g. make UIConfig to automatically run make UIConfig_<module> for all modules. Change-Id: Idc2c3a61fd38b486435366164031b4d51f68eebc Reviewed-on: https://gerrit.libreoffice.org/51274 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-04-08Revert "Fix protection of some unnecessarily strictly protected files"Tor Lillqvist
Problem now handled already elsewhere, see 2340536cf478f95e33b718d3f69da5345fc4d2b4. This reverts commit 155086493c9e035c0568868f5ae3b3dcf3299e6f. Change-Id: I4c731d4915d51dfc84982a41f8c1c6e45dfcb796
2018-03-28Check for submodules in SRCDIRStephan Bergmann
Change-Id: I4835c9aec33d611d0bdcd8150704866e76b49e9e Reviewed-on: https://gerrit.libreoffice.org/51957 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
generated by cgit (git 2.34.1) at 2024-12-28 06:42:40 +0000