Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I21521d1d7e4a139a1ea0c3f4fe6c51b4637c595f
|
|
Had been totaly broken by the recent changes. (Which is fine, it is
just an experimental hack anyway, I am not sure whether it will ever
be used in anger. Just a pet peeve of mine, I dislike seeing
libraries, configuration files, resources etc mixed together in one
"program" folder, especially on OS X, where the convention is to have
app-specific dylibs and frameworks in "Frameworks", and resource files
in "Resources". But this is not any requirement as such; there are
apps in the Mac App Store that blatantly "break" this convention.)
Basically, replace uses of gb_PROGRAMDIRNAME and
gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which
for normal builds all expand to the same "program" anyway.
Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
|
|
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
|
|
Change-Id: I5982c44d5995baeaffff4ff12316f1f8fa7d0ade
|
|
Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:
ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)
Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
|
|
/usr/bin/install -s will invoke "xcrun strip", and there are a few
hardocded install_name_tool left.
Change-Id: I839af379320b4886c45a12c9a1d4fa88d2ef0059
|
|
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)
For Android and iOS, gb_INSTROOT probably still needs to be set.
The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.
Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
|
|
...the special case for AIX can probably be cleaned up?
Change-Id: I34ca29acaddcff9b811067504c12a8243a6d046b
|
|
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
|
|
Change-Id: I8924ba22d178aa4d8e500ae3f484af654a37e87e
Reviewed-on: https://gerrit.libreoffice.org/4765
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
|
|
Change-Id: I225107d87e2fd084be536f524ae62fa0d60891f0
|
|
Apparently the native modules (.pyd) are expected directly in lib, not
in lib/lib-dynload like the .so's on linux.
Change-Id: Ic3181f189d9db51cb57630c4c1ea8741bbf879ec
|
|
Change-Id: I96979f61eac5cc48721e3733d90822406bcb49cc
|
|
Change-Id: I97d30afe3a24aab1123352da05b066095e5c86bb
|
|
Change-Id: I9ef6331e49c26ce5060aea52157a600274a1b080
|
|
program is only a symlink to it there, created by the installer.
(Hmm, would it be possible to have MacOS symlink to program instead? It
would simplify things :-)
Change-Id: If21df47da5ac7c77358656f40d9caaaa62a7e87f
|
|
Internal zlib is not really supported anyway on any platform that uses
setup.py.
This reverts commit 6afe0e5804f2a23f9fc9842d372fff77fd1023f1.
Change-Id: Icf94a85c4baf00df54ee5dcca5fe3ca4a63a54a8
|
|
Change-Id: I72798f704237f99ed49eeb3633a1e2ef481edeed
|
|
Change-Id: I80b7f86947645a45263bbd7423a10ba8300441e9
|
|
... now that everything is consistent.
Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
|
|
It must always be used exactly once, so replace it with constructor
parameter.
Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
|
|
Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1
Reviewed-on: https://gerrit.libreoffice.org/3779
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
... so move it to python/ExternalProject_python3.mk, where it belongs.
Change-Id: Ib99a6a40182341257f79dd289eac51806be46fcf
Reviewed-on: https://gerrit.libreoffice.org/3778
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
|
|
- python3: deliver files to INSTDIR, with same layout as instset
and do not deliver .lib files
- pyuno: remove obsolete python.bin targets
- pyuno: remove usage of CustomTarget_zip for WNT and non-Mac UNX
platforms (sadly it is apparently still needed for "system" python on
MinGW)
- scp2: use the python3 filelist
There is still a problem here because the installer does not currently
allow to preserve the executable bit on files in a filelist
- RepositoryExternal: run python executable from INSTDIR
and link against libraries in UnpackedTarball dir
Change-Id: I931ca0a8be6ff40051b1ca50da1f0770e6057832
Reviewed-on: https://gerrit.libreoffice.org/3525
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I2227c5c715bb656878dd97b71d59c149e7e5320a
|
|
... and get rid of LD_LIBRARY_PATH hack in wrapper shell script.
Change-Id: I7d91c6086460504d656de7b018087264165f396b
|
|
Change-Id: I3abbc36198719fc118404bfcc039fdf3397e324e
|
|
These were apparently accidentally disabled on all non-WNT platforms.
Set the OPT variable from the outside on the platform that needs it.
(regression from ab41efc81ec26fcbd4cdeb9c36fbe8cc274523f)
Change-Id: Ifbf7ec8e0f863cb6368758571496c8b615e3e814
|
|
Change-Id: I0caf3a9440c7617c9f1c643a4c3fe279d04cf1dc
|
|
This check is triggered by nested pyuno PyThreadAttach instances.
The assertion is basically about having multiple PyThreadState instances
per OS thread. Hopefully this is not a "real" problem and the other
checks in PyEval_ReleaseThread/PyEval_AcquireThread will find all "real"
problems.
http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg62195.html
Change-Id: Ia82135f37f55ea69b545a83098619939869cb7c5
Reviewed-on: https://gerrit.libreoffice.org/3453
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
|
|
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
|
|
On --disable-openssl, the bundled python library
will not build its OpenSSL module.
Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9
Reviewed-on: https://gerrit.libreoffice.org/3332
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: Ib6339c29f6820e75ff99aeb0547145597771d584
|
|
Change-Id: I47af280e24bff248e6404ec18c1afef8c461b40b
|
|
Change-Id: I8bea810debfd4f53f4c53fe06fdf1f2b9256e795
|
|
Change-Id: If8075a459acf4901ef451b24e54d88a8b68393f9
|
|
|
|
...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function
type."
Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b
|
|
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
|
|
Change-Id: I8bbc7e73e210461b465bfdcd62b2da1d974020df
|
|
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.
Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad
|
|
That python bug cause problems when libreoffice is on a read-only
media... which is very common for Mac as the dmg used to package
the produce is seens as a read only volume.
This patch the bug 15833 for MacOSX only since that is the platform that
is most likely to be impacted, and because of bug 15431 that make
patching on Windows more complex/dangerous.
Change-Id: Ie7406c1c75748d38c871b3b544560caa62e9d838
Reviewed-on: https://gerrit.libreoffice.org/1934
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
|
|
Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3
Reviewed-on: https://gerrit.libreoffice.org/1495
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
|
|
Change-Id: Ifa463327e9f33696012b3add0640b12f6d585178
|
|
Failures to build some python modules are actually not fatal, I just got
confused because the whole python build runs in parallel to the normal make.
This reverts commit f4ae375c00deb2297074c59b62db87de080bf591.
|
|
Apparently all recent systems use ncursesw, for which there is
-I/usr/include/ncursesw, but SLED11 uses ncurses lib, and there's no -I for that.
Change-Id: I61ec795aae45e1074075351eca62299784d08b09
|
|
It must be my local installation of VS2010 that is somehow screwed up
when building here it doesn't find <windows.h>. I need to fix that
instead.
Change-Id: I37a5f8b41f193b108f33464a6a127c0a5969d232
|