summaryrefslogtreecommitdiff
path: root/Makefile.in
AgeCommit message (Collapse)AuthorFilesLines
2016-06-11s/LibreOffice/CollaboraOffice/Andras Timar1-10/+10
Change-Id: Ia2de1634657ffd6e456c96042b124f8a6a3bd1d0 (cherry picked from commit 4524204e78b2e9b8b95bce108a2951b530c54051)
2016-06-11remove unopkg script from MacOSX folder of sandboxed appAndras Timar1-1/+2
Change-Id: Ib59953225480e6923e418b966cce289f07f863b5 (cherry picked from commit 5b004e8ab7c5c6780e339d92bb111fe94aba2b61)
2016-06-11We need the gengal program at build timeTor Lillqvist1-0/+14
But don't bother shipping it on OS X, at least not in the sandboxed (App Store) case. (cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5) Conflicts: Makefile.in Repository.mk Conflicts: Makefile.in (cherry picked from commit ff489b6161654d378c70ed5e3f6be82e24ec09c9) Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
2016-06-11create empty .lproj directories for languages supported by OS XAndras Timar1-5/+4
The previous solution had problems. InfoPlist.strings were empty, because localization has not been working since the CFBundleTypeIconFile entries were removed from Info.plist. Icon file basename was the key in documents.ulf. So we packages 0 bytes long files. The second problem was that we used LibreOffice language codes, and OS X language codes are different in some cases. This caused problems such as French strings on English UI (e.g. Open/Save dialogs), because the system did not recognize en-US.lproj and en-GB.lproj, and fell back to the next one: fr. Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134 Conflicts: Makefile.in (cherry picked from commit e013f39a3fe928ea22cdde6e0da1c3fe8072c588)
2016-06-11Remove potential old leftover before moving the app bundleTor Lillqvist1-0/+1
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f (cherry picked from commit 8adb16acb1aeccfacc39c2edb10d4f90374e8ff2)
2016-06-11Unzip the InfoPlist.strings files into correct locationsTor Lillqvist1-3/+9
Not sure how useful it is to only provide translations for the ODF document format names, though. Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c (cherry picked from commit 16f62d80c38f3920a40fc078edecad905ba2b196) (cherry picked from commit 4094a45c3b3c0c366e9ba9d51825f5627e21967d)
2016-06-11We don't want those bin/InfoPlist_*.zip files in the app bundleTor Lillqvist1-0/+4
(cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af) Conflicts: Makefile.in Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc (cherry picked from commit e3e3a1f3300975858caf4dff17ffb8775a6ef015)
2016-01-07configure: hard-code /usr/bin/{sort,find} for CygwinMichael Stahl1-1/+1
... 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-10-19android/source/AndroidManifest.xml is not generated during the buildStephan Bergmann1-1/+0
Change-Id: I4bb861649375b5c6178df6820eb2c759111340b8
2015-10-11migrate android build to gradleChristian Lohmaier1-1/+0
move preparation tasks (creating assets/processing files) from the makefile into the gradle script This allows much easier integration into android-studio (just open android/source with android studio after running make to compile the native library) Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
2015-10-02Remove setting Make SHELL completely from the build systemStephan Bergmann1-4/+1
...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 Bergmann1-2/+4
* 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-08-11gbuild/config stop using VERBOSE, use only verbose=tNorbert Thiebaud1-1/+1
configure.ac was setting VERBOSE=YES/NO when really we use verbose=t or verbose= Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299 Reviewed-on: https://gerrit.libreoffice.org/17634 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-05-25QtCreator IDE integration.Michel Renon1-1/+2
First version of QtCreator IDE integration : 'make qtcreator-ide-integration' generates .pro and .pro.user files for each subfolder of LibreOffice. It also creates a 'lo.pro' meta project that list all other .pro files. Developers can use use QtCreator to edit, compile and debug LibreOffice. Change-Id: Ib05d8c36a7ca055ecd7a4db5776f4c28bf05676c Reviewed-on: https://gerrit.libreoffice.org/15804 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-05-21lokdocview: adapt Android pathMiklos Vajna1-2/+2
Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182
2015-03-26add Makefile deps and cleanup for config_host_lang.mk*David Tardon1-1/+4
Change-Id: I7fabd28ccdf66a4fa96838aafadbe6ceee8d9ee3
2015-03-08autogen.sh: better error message when src_path contains spacesMiklos Vajna1-0/+1
Change-Id: I921ffaf2ee4be73ecfffca8bc36cfae484b70a32
2015-02-23android: install gdb printersMiklos Vajna1-1/+1
Commit f44f94b95b435ee0ec71c73133daeb88cd2539b1 (fix gdb pretty printers for --enable-mergelibs, 2013-09-10) doesn't really say why this was wanted, probably just to be on the safe side. Enabling them allows at least manually loading them. Change-Id: I22eeca67e4077e06efba8b3edfd6eb84159b9c47
2015-01-07Gallery missing from gbuild_TARGETSStephan Bergmann1-0/+1
Change-Id: I9f44b64f1bc6d608f80666e46cc313ac0c123475
2014-11-24Makefile: provide a hint when "make iwyudummy" failsMichael Stahl1-0/+3
Change-Id: I5d37478e1dfdd9bf96ceb302fe51fc5c2b4ed838
2014-11-24improvements to iwyudummy targetNoel Grandin1-1/+3
- split awk script into separate file - make awk work on older awk version - create new target in main Makefile.in to generate iwyudummy Makefile so we don't have to manually uncomment stuff - exclude /usr includes from the generated makefile - disable unused macros warnings to reduce noise - add some sanity checking - prevent using the generated makefile with compiler-plugins enabled - add new target for generating iwyu Makefile so we don't need to edit the Makefile when using it Change-Id: I4af8eb7d1aa5419e546acb9ef905a0fe623db57d Reviewed-on: https://gerrit.libreoffice.org/12980 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-21Call all executables in solenv/bin/ with full pathStephan Bergmann1-7/+7
Change-Id: Ib8db64b9d8ff131b5b7cadea434681a825c967e7
2014-11-20Call install-gdb-printers with full pathStephan Bergmann1-1/+2
Change-Id: I92b34e61edb641d29d1cbf344e7ae5823c912cbc
2014-11-18Makefile: set CC as well for include-what-you-useMichael Stahl1-1/+1
Change-Id: I28c8f134825e477ffe993a6895b801c9e895f613
2014-11-17add a script to generate a dummy library to "build" all headersMichael Stahl1-0/+4
... to be used together --with-iwyu to track down bloat in headers, which are not always named in the convention that include-what-you-use expects for reporting issues. Change-Id: Idffda7d49cca43170717004d52779b4663de19ae
2014-11-11add 'make etags' to generate etagsTakeshi Abe1-1/+4
Change-Id: Id87f71b6d31720173f0c5ec2a4fc395065223b79 Reviewed-on: https://gerrit.libreoffice.org/12300 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-05Add build support for iwyuRiccardo Magliocchetti1-3/+5
include-what-you-use is a tool to help removing unneeded includes. Homepage: https://code.google.com/p/include-what-you-use/ So to use it pass its path to configure like: ./configure --with-iwyu=/usr/bin/include-what-you-use May be helpful for fdo#42949 Change-Id: Idc185c5181d754b9dfd82fcf6a5ad05953b3cd03 Reviewed-on: https://gerrit.libreoffice.org/12255 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-10-10android: Re-autogen when AndroidManifest.xml.in changes.Jan Holesovsky1-0/+1
Change-Id: I53cf6bf10f25702d9ae42afb6846411a3e31c187
2014-10-07Proper AC_CONFIG_FILE treatmentStephan Bergmann1-0/+1
Change-Id: Ic029d0d174a00af783fd276852231523aae59866
2014-10-03gbuild-to-ide: Add support for vs2013David Ostrovsky1-0/+1
Change-Id: I385e756109ab0a47feeeb4407ba4a2a4b68548dd Reviewed-on: https://gerrit.libreoffice.org/11728 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2014-09-17The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mkTor Lillqvist1-2/+1
So no need to expand it at configure time in ure/source/unorc, and no need to handle the related builddir!=srcdir complications. Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703
2014-09-16Missing rm of generated file in distcleanStephan Bergmann1-1/+2
Change-Id: I463bd51ad054b66c247f4d5ad778d15f476c6520
2014-09-12TypoTor Lillqvist1-1/+1
2014-09-09Surely by now nobody has a 'solver' folder or an 'install' symlink any moreTor Lillqvist1-2/+0
Change-Id: I814311cc0b3e78774f25cac06e48dbdc1cb82c69
2014-09-09Fix help and showmodules build targetsPeter Foley1-4/+7
Change-Id: I096798159f4d3d59306be1b3843de1daca280f7a Reviewed-on: https://gerrit.libreoffice.org/11342 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-09-05gbuild: Framework for performance unit tests using callgrindMatúš Kukan1-5/+7
Run them with "make perfcheck" (toplevel or in a module) To add a new performance test: - Add it as a perfcheck target - Use gb_CppunitTest_set_performance_test - Use CALLGRIND_ macros from valgrind/callgrind.h http://valgrind.org/docs/manual/cl-manual.html#cl-manual.clientrequests Change-Id: I67c776dbe4db0a686607efeee7a7e4f3aeae0e5c
2014-08-11add a IDE generator for clang json database formatMarkus Mohrhard1-0/+2
This can be used for YouCompleteMe a vim plugin that allows auto-completition based on clang. This is much better than the normal static analyzer based auto-completition. Change-Id: I4872d2cb3b3a404af55eacf5c71d6a2715771ab6 Reviewed-on: https://gerrit.libreoffice.org/10820 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-07If dev-install is obsolete, why have it at all?Tor Lillqvist1-14/+0
Replace mentions of it in a few (dcumentation) places with test-install. Change-Id: I6fc8e58fa5813b05de16feec35215c83e0e45834
2014-08-04fdo#82136 fix download of submodule tarballsDavid Tardon1-1/+1
Change-Id: I07775391cb905f0563d1d1b3cae6f02b12d10f90
2014-07-08configure, gbuild: remove Cygwin paths from make environmentMichael Stahl1-1/+1
All environment variables contain native Win32 paths. This allows building with Win32 make and Cygwin sh.exe, but Cygwin make cannot build any more with the Win32 entries in PATH. Requires adding "bash" detection to configure since /usr/bin/env can't be invoked by Win32 make and it's possible to install cygwin somewhere else than C:/cygwin. Change-Id: Ia8f4ee3c91222e8f5919cfbfc452f12ffbfadd40 Reviewed-on: https://gerrit.libreoffice.org/9698 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-08create a new top-level makefile target "clean.internal"Noel Grandin1-1/+6
so I can clean just the non-external stuff when re-running my clang plugins Change-Id: I251ceba7e57454a91da5b1082192bb2d211e5406
2014-06-18Make things like "make CppunitTest_FOO" depend on bootstrap and fetch, tooStephan Bergmann1-1/+1
Change-Id: I5a18fb4207b68e8359a7d78fd6352902dce1e051
2014-06-10Make test-install work also in the non-release-build caseTor Lillqvist1-1/+1
In the (default) --disable-release-build case the -p option to make_installer.pl should be "LibreOffice_Dev", not "LibreOffice". See instsetoo_native/util/openoffice.lst.in. Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or LibreOfficeDev.app. Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e
2014-06-10Add --enable-macosx-package-signingTor Lillqvist1-0/+9
Change-Id: I355158f6cb584d252a21dfbce6e7cea6c70bba99
2014-06-09Makefile: prevent Win32 make from doing CreateProcess(autogen.sh)Michael Stahl1-1/+1
Change-Id: I2ed9c346a8e9cfa26aa2b04f554c56f02c400829
2014-04-25support sc.slowcheckMarkus Mohrhard1-2/+2
Change-Id: I91dcdba455660dee25accdd2185a876bf7012ff8
2014-04-17Makefile: let "make foo.genpatch" work on top-levelMichael Stahl1-1/+1
Change-Id: Ib0e370472be5da03359bca6f90287083d3465605
2014-03-23fix $(MAKE) usage in a make defineLuboš Luňák1-3/+3
$(FOO) is expanded already during the $call, $$(FOO) will become $(FOO). Change-Id: Ia5d6966c16c57e4ec688f2c7623315cc2c74c78d
2014-03-23use $(MAKE) for recursive make invocationLuboš Luňák1-14/+14
That's apparently the only proper way (to get e.g. -j right), and even the toplevel Makefile is so full of gmake-ism that it simply has to be invoked using GNU make already, hence $GNUMAKE is pointless except for usage in configure (which says to start the build by invoking it). Change-Id: I6060da6f1dad2afc5845ac29b8ac02348c057d3d
2014-03-23make it possible to build without the obnoxious forced -j to makeLuboš Luňák1-7/+9
Rework --with-parallelism to not add any extra -j to make if 0 or --without is used. This requires explicit -j usage, which - builds even compilerplugins in parallel - builds 'make -C sw/' in parallel (since you don't forget the -j) - avoids jobserver disabling if -j is explicitly passed to the toplevel make IMO this is just a relic of the old build system and the option should be dumped altogether, but I don't feel like arguing right now. Change-Id: I71479391bcfc84aa5e9fd9696880702da496d45c
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 10:08:54 +0000