Age | Commit message (Collapse) | Author |
|
Change-Id: I47dc449464cc7643d05b73e9612d01e50a8d4b8e
|
|
reshuffle things to share common core
Change-Id: I50aa0e2ddeefaa4b2d0592b1118defd28b7347db
|
|
Change-Id: If78e68556711bc9b9a00d3b18d13852adf44b9f0
|
|
Change-Id: I4d5ae63e46809341a7bb74a7c89b5a80c7a91e38
Reviewed-on: https://gerrit.libreoffice.org/32227
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I0a43bff9c87254d16ade84f3da2ff380250ebd9c
|
|
Or we could just hold our breath until Apple adds python3 to macOS.
Change-Id: I94dd054be8a28490fd86b72092a4389194ca785f
Reviewed-on: https://gerrit.libreoffice.org/32047
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
and builds as root in that env, at least the default out of the box
experience is that for me, I suppose I could faff around getting it add a
user specifically for the build like I do for my coverity in docker
build, or just drop this.
This effectively reverts
commit 466257699559390237615f651ce0f30f07543434
Author: Tor Lillqvist <tml@collabora.com>
Date: Thu Apr 14 09:01:48 2016 +0300
149
Change-Id: I63f055756ff5f571d5ebe89aa4aee52d8ae2c510
I see your 149 and raise you a 1172
Change-Id: I3e81a725cdab1ff5ead0484dbfee11ac8fe303a9
|
|
Change-Id: Ic3ac11683a44e946e844e18a7670fa7baf46110a
Reviewed-on: https://gerrit.libreoffice.org/31175
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Luke Benes <lukebenes@hotmail.com>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
- the json stuff is universal and not limited in use to IDEs
- the IDE stuff should keep its gbuildtoide name
Change-Id: If4f190fc6dffba219334d57a53c826515ed57c34
Reviewed-on: https://gerrit.libreoffice.org/31093
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
...as that, somewhat surprisingly, causes 'make MODULE.all' do additional
targets that a plain top-level 'make' would never do. See discussion in mail
thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2016-November/075797.html>
"[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' [...]".
Change-Id: I460f3c91cf00d3398c61833fdcd5eaebdc87fbf2
|
|
- also add gbuild selftest to test this (and possibly more later)
Change-Id: Ia4ef41095613e596f39d107df700e929579ba45f
Reviewed-on: https://gerrit.libreoffice.org/29744
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
|
|
On Mac OS X 10.8, the directory contains "bin" but not "include", so it
re-runs autogen.sh all the time.
JAVA_HOME=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
Change-Id: I9065c8daef47df535f60267fc2c3e7cb23fc3910
|
|
Of course not tested in any way but with any luck the project file
format hasn't changed and it will "just work".
Change-Id: I81c5043259feeabd69ef31ea7ef160901ac7ebdc
|
|
Change-Id: I5498122f200aee198fb639189fdb93f89462c7b1
|
|
On Fedora it often happens that the $JAVA_HOME directory is not actually
deleted but contains a bunch of ".rpmnew" and ".rpmsave" files in
jre/lib/security - so check that the "include" directory exists.
Change-Id: I34bf945b346e79dbe6f1a6e96ba1ba5139ff8f13
Reviewed-on: https://gerrit.libreoffice.org/28491
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I6f3540f919f109b88628ed081a184b9e29a35450
Reviewed-on: https://gerrit.libreoffice.org/28203
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
Up to now the screenshot creation was added/dependent of
target slowcheck. Since quite some modules have added screenshot
creations now, I added an own target 'screenshot' to allow to keep
current slowcheck and screenshot creation separated
Change-Id: I80a49a0db607edf8e0405672d570f624d29912e7
|
|
The new option thoroughly replaces the product name mentioned in the
AC_INIT() call. Work in progress.
Also take care of spaces in the product name in a more systematic
fashion.
This should affect mainly OS X where the final app bundle that is
installed should use the product name as such, including spaces, if
any. However, our build system does not cope that well with having an
app bundle with spaces in it in instdir. So in instdir, and also in
test-install, spaces are stripped away from the product name when used
as part of the app bundle name.
Change-Id: Ic16b5039f23c96a4f39387a1869faeb25e05aafb
|
|
Quote from stackoverflow: "source" is non-standard and specifically
not supported in ash, dash or pdksh... it's a Bashism.
Change-Id: I4b47385c1e44c5e56bd84f23ff3645712015dcf4
Reviewed-on: https://gerrit.libreoffice.org/27746
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
|
|
On Fedora, the weekly OpenJDK security updates put the headers into a
different directory each time because the full version of the package is
encoded in the name of the directory. Then a incremental build breaks
somewhere in jvmfwk because the headers cannot be found in the old
directory.
So add a hack to detect a non-existent JAVA_HOME and re-run autogen.sh
in the hope that the following incremental build with work.
Change-Id: Iada3cfa3e9a0120d38c6b01484f505ff20770b72
Reviewed-on: https://gerrit.libreoffice.org/27339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I3ea4f0682250ddb475c66a9782194177e6ae7586
|
|
...where the latter failed to rebuild compilerplugins if necessary, while the
former did.
(No idea about the proper dependencies of "make $MODULE.showdeliverables".)
Change-Id: Ib6f8e193445229745475aa52eb7a78ebb30e49e5
|
|
Somebody who might invoke make as root might also invoke make with -j,
so don't start building in that case.
Change-Id: I0c87aba948cd78a23ad4c49f880700f65684424c
|
|
We now can call the uitests with make uitest.uickeck
Change-Id: I20c73efd93c7987f3b841cd0e3e7842ee7a5dab9
|
|
Change-Id: I2fc5e8fb2535ac076f045435c828126a52ea5bbd
|
|
Change-Id: Ib8dc0267034716740ba6d7f60cf635adc4bd1561
|
|
Change-Id: I4c96dbecd90de83fe9ac76a93ec0520ffb6932d6
|
|
Change-Id: Id6bd2dfd05f1c13d928dbf26414b01086740df74
|
|
Change-Id: Ib690eb05deaec5d8ce91f6b76daadf427d7ad964
|
|
Change-Id: I63f055756ff5f571d5ebe89aa4aee52d8ae2c510
|
|
Change-Id: Ib59953225480e6923e418b966cce289f07f863b5
(cherry picked from commit f16f8ee5c2a269339a36bf6af9b24b50b4328a37)
|
|
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 packaged 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.
Conflicts:
Makefile.in
(cherry picked from commit 91902ef1411943f65da296fefd15fff9170d9c0c)
Change-Id: I9c502cdf737b497ca2ceef8f3c535ccfea2f6134
|
|
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
(cherry picked from commit 53c396c7008b807cffcc501171520b28c3f2ad24)
|
|
I doubt end-users will miss gengal.bin, regview, or regmerge.
We need the gengal program at build time. But don't bother shipping
it on OS X, at least not in the sandboxed (App Store) case.
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
|
|
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 348ac6a9d28d5961b8804a7be09d334fbc8ef21a)
|
|
(cherry picked from commit 7956d38fa3c0db77b9b2b41f870bd3587e3dc1af)
Conflicts:
Makefile.in
Change-Id: I29eefa599f175d98303fca8f5ccf1c8fe85b0bbc
(cherry picked from commit b21140e2de219cd97cae5b7b9b988e1fd70da029)
Reviewed-on: https://gerrit.libreoffice.org/22860
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
|
|
...where "/opt/lo/bin/make.exe distclean" had started to fail with
> rm -fr C:/lo64/core/test-install
> rm -fr C:/lo64/core/instdir
> rm -fr C:/lo64/core/workdir
> C:/cygwin64/bin/find: paths must precede expression: rm
> Usage: C:/cygwin64/bin/find [-H] [-L] [-P] [-Olevel] [-D help|tree|search|stat|rates|opt|exec] [path...] [expression]
> Makefile:170: recipe for target 'distclean' failed
> make: *** [distclean] Error 1
Change-Id: I98ecb51ba1747d55aec0eb80f5ec5a257dd5af76
|
|
Change-Id: I2af71d5039d330518ea115e6a95af1f15c376538
Reviewed-on: https://gerrit.libreoffice.org/21722
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
|
|
... 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>
|
|
Change-Id: I3fba2c76c83381eb398c80947ef4849bccf7ab27
Reviewed-on: https://gerrit.libreoffice.org/21078
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
|
|
This patch generated a setting file for per module. When imported the
eclipsesettingfile.xml, underlined include lines are clearing up.
Setting file includes included file paths for per module and provides
correct build. .project file generator deleted because eclipse
is creating .project file and overriding it.
This adds a new property to the parser that stores each module.
Change-Id: Ia10bb37c7c3fdb444a5b79ddf502b962e8ee5736
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
|
|
Change-Id: I4bb861649375b5c6178df6820eb2c759111340b8
|
|
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
|
|
...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>
|
|
* 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
|
|
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>
|
|
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>
|
|
Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182
|
|
Change-Id: I7fabd28ccdf66a4fa96838aafadbe6ceee8d9ee3
|
|
Change-Id: I921ffaf2ee4be73ecfffca8bc36cfae484b70a32
|