summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2016-08-02Seems that Clang in Xcode 7.3.1 produces broken code with -O2 in some casesTor Lillqvist1-0/+2
For instance CppunitTest_sw_mailmerge crashes when dbaccess is compiled with -O2, but works fine with -O1. Did not bother with any closer checks for Clang version for now in this branch. Change-Id: I7941e89af312f3102d8b2f4476e29deaaa4d966c
2016-08-02Don't use spaces in the product names when packaging.cp-5.1-3Jan Holesovsky1-1/+4
Change-Id: I55f332117cc7530eb6d562846db379d95e628a22
2016-07-29Quote the product name as it might contain spacesTor Lillqvist1-1/+1
Otherwise we get "ERROR: unknown parameter: Office" for a product called Collabora Office, for instance. Change-Id: Iec99a3eb0848c34861be03ab6036aed707b20ac4
2016-07-20Fix typosAndrea Gelmini1-1/+1
Change-Id: I4586168d3af81f047a4ded59fc6d257f17554885 Reviewed-on: https://gerrit.libreoffice.org/22194 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 6d68e88a0fc5a54bbb826379163bd0b9c6eae0fb)
2016-07-20Fix typosAndrea Gelmini3-3/+3
Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 64d624b65124ac02d8ee59b135593fd9d8eb9067) Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
2016-07-13desktop: validate OpenCL drivers before use.Michael Meeks1-0/+1
OpenCL validation needs to happen before drivers are used in anger. This should isolate any crashes, and/or mis-behavior to We use app version, CL driver version and file time-stamp to trigger re-testing the device. If anything fails: hard disable OpenCL. We use an opencl validation sheet (cl-test.ods) and install it. It is a minimal CL set - it requires a very short formula group length, and combines several CL functions into few formulae to test more. The sheet structure, in particular the manual squaring / SQRT is necessary to stick within the default CL subset, and ensure that formulae are CL enabled from the root of the dependency tree up. Reviewed-on: https://gerrit.libreoffice.org/27131 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit c44726c48228d9c6a5960e302b1c0bd16b0099c4) + opencl: bail out early in missing OpenCL case. (cherry picked from commit 605a5dc088385ad21c33028d8107125c0316ddb1) + Remove bogus dependency from opencl to configmgr Since f41eb66302208f384a475fb20c98b6d1b0676cb6 "opencl: OpenCLZone, detect CL device change and disable CL on crash" vcl links against opencl (so indirectly linked against configmgr), which caused CppunitTest_configmgr_unit to include the configmgr object files both statically (through gb_CppunitTest_use_library_objects) and through the linked-in configmgr dynamic library, which in turn caused ASan builds to report an ODR violation for a doubly defined 'typeinfo name for configmgr::Access'. (cherry picked from commit 9c711f05fa10dc70e4257a1f48d43f539353541a) Reviewed-on: https://gerrit.libreoffice.org/27146 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9befbe1f81a7930e167e0a711666b0779898c12e) Change-Id: I18682dbdf9a8ba9c16d52bad4447e9acce97f0a3
2016-07-13opencl: OpenCLZone, detect CL device change and disable CL on crashTomaž Vajngerl1-0/+1
Guard OpenCL calls with OpenCLZone, so if a OpenCL call crashes we detect this and disable OpenCL so next time the user doesn't encounter the crash at the same calculation because he has a broken OpenCL drivers. Similar has been implemented for OpenGL with good results. Additionaly we persistently remember a known good OpenCL device ID and driver version so we can match this and perform calculation tests when they change. This is to ensure that the selected OpenCL device performs as we expect. In this commit the calculation tests aren't included yet. Remove complex static initializer in opencl wrapper library. Reviewed-on: https://gerrit.libreoffice.org/27064 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit f41eb66302208f384a475fb20c98b6d1b0676cb6) Change-Id: I1a8b81ee31298731efcf63dc6a476955afc035e9 Reviewed-on: https://gerrit.libreoffice.org/27103 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit e1ef22371613f384cc2f6fc75d022cb01bf92af7)
2016-07-04gbuild: recognize newfangled screen TERM=screen.xterm-256colorMichael Stahl1-0/+1
Seems to have changed from Fedora 23, where it was just "screen", to 24. Change-Id: I9078c337093d12d62e9afe10b1f02aaf346d4b43 (cherry picked from commit 4dcba01d97b72db35885c505e647425059740a4c) Reviewed-on: https://gerrit.libreoffice.org/26766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1ddc2f93c49660cf651f4faeb1f0f596eab953e2)
2016-06-26tdf#98955 hardware_concurrency not ideal for thread poolsAshod Nakashian1-0/+3
A new static member getPreferredConcurrency added to comphelper::ThreadPool to return a configurable max number of threads. By default the new function returns the hardware_concurrency value provided by std::thread. When MAX_CONCURRENCY envar is defined, the return value is limited to whatever is set there. Three call-sites that used std::thread::hardware_concurrency have been replaced with getPreferredConcurrency. Unittests added to cover the functionality of the new member. Unittests are capped to 4 threads. Reviewed-on: https://gerrit.libreoffice.org/26254 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 60e75fb276778459f6055360646d879b8c615d83) Change-Id: I3332e393a88a5ed436316fa712ed920a4b37f4af Reviewed-on: https://gerrit.libreoffice.org/26394 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 197c1dacd5725db8ab2faf0aa9b39a2655eb4940)
2016-06-11OS X codesignAndras Timar1-59/+64
Change-Id: Ic2ea2851183ce2c0987c3e88113a03e73064a6b8 (cherry picked from commit 00191a2a634f6d4c9c9934afe163a6e4ae469286)
2016-06-11OS X: codesignAndras Timar1-65/+60
Change-Id: I6971a7c4f5f230dc6ac01c91e4183c24f847e061 (cherry picked from commit 74f4fad849ca2812d67ff326217f37f8d41bbf01)
2016-06-11Collabora Office OS X packagingAndras Timar2-8/+12
- added EULA (sla.r) in special OS X resource fork format - added volume icon which does not work ATM, TODO later - new dmg background image and adjusted .DS_Store - fixes to tolerate space in app bundle name Change-Id: I3f341bfcd5bea88681e57b314f6069be107c5c2b (cherry picked from commit 26d77ceefcb59a95fff71c730d798d6b59021fc0)
2016-06-11hack to fix an MSP creation errorAndras Timar1-0/+2
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c (cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff)
2016-06-11Collabora Office brandingAndras Timar2-2/+2
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
2016-06-11OS X codesignAndras Timar1-59/+65
Change-Id: I71d49b20a7ce96bbbbe3d130a8e8230c7afc0351 (cherry picked from commit 58fca586668421ad13448622a90f230917a0b3e2)
2016-06-11Collabora Office EULAAndras Timar1-1/+1
Conflicts: readlicense_oo/Package_files.mk Change-Id: Ia380db465f5094216cb36526f6cc178043376356 (cherry picked from commit 2e8f1c8598c34a5cf0779f23fe66091115fa0fc6)
2016-02-29MSVC 14.0: Fix building 64bit libraries in 32bit modeDavid Ostrovsky1-1/+2
Change-Id: I006d21b6240898cbaed2b382276654d3ad8076a2 Reviewed-on: https://gerrit.libreoffice.org/22732 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 271bfb59382e1d23e0f2c90ea8e8e31fd757e3b5) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-02-22windows: silence new warning for nowNorbert Thiebaud1-1/+2
Change-Id: I10b3269e3ac81f0c7e3fa60229e2b1e3fcab512b Reviewed-on: https://gerrit.libreoffice.org/22590 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 133610669b8707a278d9b3b0af025779044fd8c5) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-02-22Force pdb write synchronization on all MS compilersDavid Ostrovsky1-8/+3
Change-Id: Id367ad150fa50cb3ed4d32cb5c7c8408f91e371a Reviewed-on: https://gerrit.libreoffice.org/22544 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 3b1d7027de241ff02d7c72d2688a5e1acc25d5be) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-02-22move disabling of LNK4217Noel Grandin1-0/+6
since it's Visual Studio specific, not Windows-specific Change-Id: I740b392f1aa9ff9c534b0e2fe021de7f93495e4c (cherry picked from commit 686611019fee67e130452ad0b4abe50647d948fb) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-01-25gbuild: missing dependency in CustomTargetMichael Stahl1-5/+6
Change-Id: I560384d91fa5c6ba42123330369628419fe1bc1c (cherry picked from commit 25aea9b1ec325d060f0d29cddfc3762ca175e511) Reviewed-on: https://gerrit.libreoffice.org/21781 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-07configure: hard-code /usr/bin/{sort,find} for CygwinMichael Stahl4-4/+4
... to avoid calling C:/Windows/system32/{sort,find}.exe, if those happen to be first in PATH. On a Windows 7 system, the other conflicts appear to be harmless, we don't use "more", "expand", "timeout", "whoami". Change-Id: Iceefeb7ee6725291b04c0eba465991bb1df96b57 Reviewed-on: https://gerrit.libreoffice.org/21175 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit e9cd5087366f930efd89a95c0a5610fe8f375581) Reviewed-on: https://gerrit.libreoffice.org/21205 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-19Add build toolchain to upload LibreOffice API to Maven CentralDavid Ostrovsky7-0/+624
Set up the toolchain to create sources and javadocs artifacts in addition to JARs created during the build. Use Buck build tool for that: [1]. This is a fork of Google's build tool Blaze, created by Xooglers at Facebook. This build tool (like Blaze itself) uses Python to write build files. Add needed tools and build files to install LibreOffice API artifacts to local Maven repository or deploy them to Maven Central. To build all needed artifacts LibreOffice must be built regularly with GNU make first. To build the rest of the API (sources and javadocs): $> buck build api To replace version number with upcoming release version: $> solenv/bin/version.py 5.1.0 To install the API to local Maven repository: $> buck build api_install To deploy the API to Maven Central: $> buck build api_deploy Detailed documentation is added to document the prerequisites and the workflow to upload LibreOffice API to Maven Central. * [1] https://buckbuild.com Change-Id: Ibdd552a01110836703bc069abe829b9921491cac Reviewed-on: https://gerrit.libreoffice.org/20343 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 1fd41f43eb73c373cb94d32d82c5fb7a7e243367)
2015-11-30try to fix gengal dependenciesMichael Stahl1-5/+1
The component files are not necessary as gb_Executable__register_gengal already adds the service.rdb; the gengal.rc is insufficient as that file references fundamental.rc which is missing, so depend on the Package instead. Also, INSTDIR is wrong for cross-compile. Change-Id: I30711a51e04539832657a242d2573c626b1cf8ec (cherry picked from commit d764100d620ab8331a8d6bb80984ace09ec65b5c)
2015-11-30Mend gallery build dependencies for OS/X and add services/services.rdb dep.Michael Meeks1-1/+2
Change-Id: I628b7986253108a6f9ea8eed28ae3b3f0f8b91b1 (cherry picked from commit a8860122fecbaa932a48f41a38077f621275be9d)
2015-11-30macosx: typo: it is unittest-failed-MACOSX.sh not .mkNorbert Thiebaud1-2/+2
Change-Id: Ic1e25f3f945e32f2b99c2cfedc4b8d695635bd8b (cherry picked from commit f1c6db90b519d35e7e6b62adbbd07ad5bd4cabfd)
2015-11-30gbuild: document BUILDTOOLTRACE variableMichael Stahl1-0/+3
Change-Id: I17ebccb268e317346ca05d6a112ec33357684876 (cherry picked from commit b1b8d82558089dd0979f7c70c4004479a6355616)
2015-11-27Attempt to improve gallery generation dependencies.Michael Meeks1-1/+4
Change-Id: Iab196e87e0eb4b063d77fe4af10c58b8355665c4 Reviewed-on: https://gerrit.libreoffice.org/20210 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-11-20wrap to allow for tests with longer names without inconvenient linebreaksBjoern Michaelsen1-3/+6
Change-Id: I9d1ae01d29ff08ce9de34d86088c1bbbe53bd159
2015-11-20Revert "Fix dependency for Mac"Bjoern Michaelsen1-1/+1
This reverts commit de37e7ae4808dc9cdd84a8c21411958ed51db56. This should now be properly fixed with a2185987. nitpick: That commit was refering to a wrong commit anyway, it should have refered to a2185987d instead. Change-Id: Ic46db94568ac4074f471f42678cdf8d9fb32ef67
2015-11-20set gb_PythonTest_DEPS in .../platform/macosx.mk for realBjoern Michaelsen1-0/+1
Change-Id: Icc7f6f063e6a31d3d84e9757dc45859f6fe1703c
2015-11-20Fix dependency for MacStephan Bergmann1-1/+1
...broken with 4f76e46290b26deeb4f9660c580a5ffef58a557e "make CPPUNITTRACE=TRUE a shortcut for debuging on WNT" Change-Id: Ie6a601da3d4310ea4d43410f8a8e2ddaa16e287d
2015-11-17make CPPUNITTRACE=TRUE a shortcut for debuging on WNTBjoern Michaelsen4-3/+14
Change-Id: Ie834e1e1592163977435f0af6dde04c4fe86c1bf Reviewed-on: https://gerrit.libreoffice.org/19977 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-11-17refactor unittest help messageBjoern Michaelsen7-41/+76
- get platform switch logic out of shell script - platform specific stuff should be in $(GBUILDDIR)/platform, if possible - do not suggest shell-polluting exports, which might lead to confusion later, suggest setting the var as a one-off addition to the make command - move exception caching down, as it is assumed to be used rather rarely Change-Id: I01db3ca07582a6c6213ebac86fddabb28c925d50 Reviewed-on: https://gerrit.libreoffice.org/19976 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-11-12Make "make debugrun" use lldb on MacStephan Bergmann1-4/+2
...the way command line arguments for the debugee need to be passed to lldb with some JSON quoting looks really odd Change-Id: I11a74ee6f8969664e9ba1cd72d2e3723848ceea1
2015-11-12tdf#76239 extract real file version from ttf filesAndras Timar1-2/+17
Change-Id: I9f611a272e6694fe1f9bd5f75358e865eaf3fe5f Reviewed-on: https://gerrit.libreoffice.org/19941 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-11-12Generalize COM_GCC_IS_CLANG -> COM_IS_CLANGStephan Bergmann4-7/+7
...in anticipation of building with clang-cl.exe on Windows Change-Id: I1d723c9d3b5ca8a2bc6b27ef0189a7b053581398 Reviewed-on: https://gerrit.libreoffice.org/19928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2015-11-10tdf#76239 fake file version for font filesAndras Timar1-0/+5
Change-Id: I59a9401c0bdc2d641ea54498af0eb1e589ab12f3
2015-11-10Avoid -Werror=pedantic when building CppunitTest_libreofficekit_checkapiStephan Bergmann1-1/+1
...at least the Linux-deb-x86_64@56-lhm-ubuntu-trusty tinderbox complains that > include/LibreOfficeKit/LibreOfficeKitInit.h:223:77: error: ISO C++ forbids casting between pointer-to-function and pointer-to-object [-Werror=pedantic] > pSym2 = (LokHookFunction2 *) lok_dlsym(dlhandle, "libreofficekit_hook_2"); Change-Id: Ibd75a44fcc7da35ea32bde3fd2a300a16493789f
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann1-3/+3
Change-Id: I5dfb8238b1365502544f6a383313311a9afd0e80
2015-11-09Remove misleading 'make build' line from gbuild helpThorsten Behrens1-1/+1
Change-Id: If389e2dc6f5af07662e6ab8aa94e0e9ce8e30f5b Reviewed-on: https://gerrit.libreoffice.org/19865 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-11-03Support of popupmenu resource typeMaxim Monastirsky1-0/+18
Reusing the same xml format as the menubar, except that a popup menu use menu:menupopup as the root element. Change-Id: I2987af0dc698b09aeeb757cff828617515bc3009
2015-11-02Let --enable-symbols only control emitting debuginfo, not optimization on MacStephan Bergmann1-4/+4
...as on all the other platforms Change-Id: I12def7c50b5aabf29e156e87321cd76d216191ad
2015-11-02Pass emit-debuginfo flags into special bridge compilations, if applicableStephan Bergmann5-11/+13
(i.e., if any of --enable-dbgutil, --enable-debug, or --enable-symbols); introduce gb_DEBUGINFO_FLAGS for the platform-specific flags Change-Id: I4306fa30ced57d40d5b1206a0b26a886411118ef
2015-11-02Improve gb_Helper_print_on_error, and use in a CustomTargetStephan Bergmann1-1/+7
* always wrap the sub-command in ( ... ) * if no 2nd arg is given, use a temp file Change-Id: I7b43214dda1e4f8ee5e9b9a7310d58adee2a6500
2015-10-29filelist-split: reading dos files under cygwin retains \r\nChristian Lohmaier1-2/+3
so \r needs to be taken care of in the split-regex as well Change-Id: I834d8dcb95b48bbe6c8fa034d5621f006c0dcef8
2015-10-29filelist split: condition the pattern instead the whole blockChristian Lohmaier1-16/+8
avoids a more complex regex with branches, and doesn't duplicate the execution block Change-Id: I48550c7ea2938001c139b9baecd1282727d7db31
2015-10-29solenv: hack to maybe fix WNT instset creationMichael Stahl1-3/+16
Apparently that regex doesn't work on WNT for non-obvious reasons; clearly this should be fixed properly by somebody with actual Perl knowledge. (regression from 644fe0abd5dd9fb468c913337ae616fe26f9e3ad) Change-Id: Ifed4ff3305e4961709a45f6a0ce40dc0683ccf28
2015-10-26solenv: try to fix installer erroneous error detection of python3.5Michael Stahl1-1/+1
... which (on Mac) has files named "error.cpython-35.opt-1.pyc", "error.cpython-35.opt-2.pyc", and "error.cpython-35.pyc". Change-Id: I24cea3c7d2aacbda5e39224a975e1c6b34a57244 Reviewed-on: https://gerrit.libreoffice.org/19608 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-10-26allow file names with a space in filelistsDavid Tardon1-1/+1
Change-Id: If83c73c3a8a0aab24c31199e3c31d90c215f3eac
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 11:28:34 +0000