summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
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
2015-10-25fix typoDavid Tardon1-2/+2
Change-Id: I06373679497ffc3472905251327073c878b48342
2015-10-24Remove left over references to SYSTEM_MOZILLADavid Ostrovsky1-5/+0
In a0c53a961a0af21f69f592b43799cd635c994810 SYSTEM_MOZILLA was removed. Change-Id: I421a293c7611dd5ed0d810c9c8a80f19faf1689a Reviewed-on: https://gerrit.libreoffice.org/19580 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-10-23lp#1170035: Fix l10n for quicklistBjoern Michaelsen1-1/+1
2015-10-22gbuild: incremental builds with --enable-pch are unsoundMichael Stahl4-3/+13
The problem is that the precompiled headers' dependency files are not run through concat-deps, hence they directly refer to headers of external libraries' headers, which are not targets in the build system; therefore re-building an external library does not cause the dependent PCH to re-build and (at least with MSVC) the object files don't depend on headers included via PCH anyway, so we get the recent link failure in comphelper with MSVC, which wasn't rebuilt for icu's ABI change. To fix that just use concat-deps, which re-writes header dependencies to UnpackedTarball target dependencies. Change-Id: Ic7555822925aaa1ff09b29bb73801fb83923bfab
2015-10-20tdf#95169 - copy snk files before using them to link.Michael Meeks1-1/+3
Ideally this should not be necessary; apparently something takes an exclusive lock which messes with parallel 'al' invocation using the SNK key file. Change-Id: Id4d5818a734a5591f826af230b71839dc076bb1f Reviewed-on: https://gerrit.libreoffice.org/19442 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-10-16Missing dependenciesStephan Bergmann1-2/+6
Change-Id: I7e0248c0e238910bedc098d98107a6a1083e41d6
2015-10-14Output all links.txt icons pointing to other icons in one goYousuf Philips1-1/+7
Change-Id: I9fa031c84157d573a63c9e31458ba578618e1596 Reviewed-on: https://gerrit.libreoffice.org/19350 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-10-11tdf#90053 add svgio to Android Viewer, so display of svg worksChristian Lohmaier1-0/+1
the default Impress templates also make use of it, so not having it only displays white background... Change-Id: I34ffab7389fce60941fd926673a4999d40c50190
2015-10-08OOOVENDOR is redundant here, it is defined by configureAndras Timar1-1/+0
Change-Id: Ied46fd0bfaf010fc819e312a49e2fe3aa5656ee4 Reviewed-on: https://gerrit.libreoffice.org/19255 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-10-07relax deps of link target on external projectsDavid Tardon1-2/+4
Compilation of the link target's source files does not require the external project to be built, just unpacked, unless the project generates some needed headers during configure/build. Change-Id: I2c9947cf13ce86878d2649829052551fc54f3883
2015-10-05Emscripten: First steps of porting to EmscriptenSamuel Mehrbrodt1-0/+18
See https://wiki.documentfoundation.org/Development/Emscripten for details Change-Id: I977a8b9e98b9be13c263fef48f567b92347d0492 Reviewed-on: https://gerrit.libreoffice.org/18643 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-10-05Fix gb_CppunitTest__use_vcl dependenciesStephan Bergmann1-1/+1
Regression introduced with 41c66312885393614c274897fd75a25c2ddf6ba0 "The 'svp' 'plug-in' library is empty so don't build it at all" Change-Id: I534173372ee21e16c78693f60957706bbf61c1c8
2015-10-02Remove setting Make SHELL completely from the build systemStephan Bergmann2-14/+0
...this is a follow-up to efad388f756014a7df5ed6f8e4ce417d24e9aba9 "Clean up Make SHELL handling," which broke out-of-tree builds. There appears to be no good reason at all to fiddle with Make's own behavior of determining its SHELL variable (which defaults to /bin/sh and can be overridden via a SHELL=... command line argument when invoking Make). The SHELL_BASH fiddling in configure.ac and Makefile.in was probably cargo cult carried along ever since 815f157c05ebc20e91a050823f048a977b8ae103 "CWS-TOOLING: integrate CWS configuretoplevel," in a time when the OOo build system still defaulted to tcsh. Change-Id: If906164abb6aae649ce8088d945a40213deed361 Reviewed-on: https://gerrit.libreoffice.org/19093 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2015-10-02Clean up Make SHELL handlingStephan Bergmann3-19/+14
* In configure.ac, honour a preset SHELL_BASH when determining SHELL_BASH (so it can be passed in via autogen.input). * For both toplevel "make" and per-module "cd $module && make", consistenly use the SHELL_BASH determined in configure.ac as the Make SHELL. (By moving the setting to a new, common soleng/gbuild/shell.mk. This also exports SHELL as an environment variable to sub-processes now; this exporting can probably be reverted if it is not what is actually wanted---but note that this exporting of an environment variable to sub-processes is unrelated to how nested invocations of $(MAKE) obtain their Make SHELL setting, see below.) * Remove the gb_SHELL override feature from solenv/gbuild/gbuild.mk; for one, it is unclear how it was intended to interact with setting SHELL=@SHELL_BASH@ in the toplevel Makefile; for another, overriding SHELL can be done globally via setting SHELL_BASH in autogen.input now. * Make treats SHELL specially, in that it never uses the SHELL environment variable to determine the Make SHELL variable. Instead, if this Make invocation, or any outer Make invocation it is nested in via calls of $(MAKE), was called with a SHELL=... command line argument, then that value is used (and otherwise the default is hardwired as /bin/sh). So, when calling nested invocations of $(MAKE) from the toplevel Makefile, pass down the current SHELL value via a SHELL=... command line argument via GMAKE_OPTIONS. (And further nested invocations of $(MAKE) will then automatically inherit the SHELL value given on the outer invocation's command line.) Change-Id: I67fa1b88e4e90d09456c1fcad2d082fdce3c019b
2015-10-02tdf#88801 android: add services needed to load flat ODF documentsMiklos Vajna1-0/+4
Change-Id: I5767fa9a240b23de098fc6012555691dfb22c400
2015-10-01loplugin:unusedmethodsNoel Grandin1-2/+2
- improvements to the plugin to find more method calls - improvements to python script to remove more false+ - fix the FORCE_COMPILE_ALL build flag to include code in the $WORKDIR Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836 Reviewed-on: https://gerrit.libreoffice.org/19064 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>