Commit graph

720 commits

Author SHA1 Message Date
Michael Stahl
f1d0889058 put result of make test-install into top-level test-install dir
... and rename all DEVINSTALL variables to TESTINSTALL.

Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
2013-10-01 18:03:36 +02:00
Tor Lillqvist
aa6eee03c6 Simiplify test
Change-Id: I8ab1842ef1eb6f2988a547f0837daa81bbaff595
2013-09-30 22:33:45 +03:00
Tor Lillqvist
739ddcfd83 Check separately and more thoroughly what the C++ library is
I.e., GNU libstdc++, LLVM libc++, or Microsoft. Also, do the grepping
for "visibility push" only in the libstdc++ case.

Change-Id: Ibf1038e37780774d9595eccfe47894dd88fc5591
2013-09-30 22:11:18 +03:00
Kohei Yoshida
5840d3b050 Enable orucs by default on Windows.
Change-Id: Ic23a7a85a162e61660a8aee877fee4de83af52ed
2013-09-25 20:15:09 +02:00
Thomas Klausner
937cc1b38f Use portable '=' comparison operator for test(1).
'==' only supported by bash, not even GNU coreutils.

Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2013-09-24 14:57:36 +02:00
Matúš Kukan
6a66cfe6aa remove unused EXEEXT_FOR_BUILD
Change-Id: I6ac851e3ba418bb681f69f5417c74688776498be
2013-09-24 13:23:49 +02:00
Tor Lillqvist
bbbc51e931 Create a proper Info.plist for the OS X app bundle already in configure
After recent instdir changes the SCPZIP_REPLACE thing was not used any
more for Info.plist, so all the ${FOO} things were left in Info.plist
unexpanded with predictably wonky results, a non-working app.

Instead just expand it from the configure script.

While at it, use a correct CFBundleShortVersionString: only three
integers should be in that.

Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION
as 1.0, and drop the "variables", as that is what those "variables"
*means*. They were used to refer to the OOo 1.0 formats. (It would
have been utterly wrong to define them as something else, like another
product name and a newer version number, in openoffice.lst, so
pointless to have them there.)

Drop the meaningless BUILDIDCWS.

Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d
2013-09-24 02:00:52 +03:00
Tor Lillqvist
0618b35ebd Fixes for cross-compilation on OS X (to iOS)
Introduce SDKDIRNAME as a configury variable and use it instead of the
gbuild gb_Package_SDKDIRNAME. Then we can easily construct the
SDKDIRNAME_FOR_BUILD variant that is needed to find the specially
named SDK in instdir on OS X when cross-compiling.

Move the version number section in configure.ac earlier.

Change-Id: Iee3db1a50ad4c7a9f91bbc5e0d0b01d76a76f701
2013-09-23 15:38:10 +03:00
Tor Lillqvist
5da2821ccb Thinko
Change-Id: I31e1c7a7f0017abe6d4e45f32ea4aad6545cffe1
2013-09-23 12:11:07 +03:00
Tor Lillqvist
4c63fd10a5 Try to fix cross-compilation
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
2013-09-23 00:54:43 +03:00
Michael Stahl
95fd55620b configure: oops, there were 2 harfbuzz lines to fix
Change-Id: Ib1869134b971c04a9cbd5d15b206898e943aaa5e
2013-09-22 12:19:50 +02:00
Michael Stahl
2f6261fa07 find lots of external static libraries in UnpackedTarball dir
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
2013-09-22 11:08:33 +02:00
Andras Timar
1a4258667e fix find_al() under 64-bit Cygwin
Change-Id: I2797763f64733a83858bb08d760c9c453d63e1f8
2013-09-20 05:34:23 -07:00
Miklos Vajna
e0abdc0c2a configure.ac: use ${INPATH} instead of wildcard
Change-Id: I92c9b72722035ef03e839029a149221dec3fe5b4
2013-09-20 09:43:30 +02:00
Tor Lillqvist
fed96abcb5 No need to by default avoid liborcus for Android, iOS and OS X
Change-Id: I0e96784a86fa1f62718264fc09f0d2b4646ecd7d
2013-09-19 19:59:18 +03:00
Kohei Yoshida
03f548e6fb Allow enable / disable opencl at build time.
Change-Id: I65e2a71aae8317930d1575e7d82c11c3fd2b74de
2013-09-19 17:03:16 +02:00
Kohei Yoshida
f1717208ec Remove opencl-sdk configure option, and build time opencl conditionals.
We now load OpenCL library dynmically at run-time as needed. So there
is no build time dependency on any OpenCL implementations.

Change-Id: I214399060398a7c5e37b9a254147ccc2834e7866
2013-09-19 17:03:16 +02:00
Jan Holesovsky
0b498f3497 Don't advertise make dev-install any more.
Change-Id: I171c7e3e55b7f23d331dd1769428fb684fe214eb
2013-09-19 12:43:45 +02:00
Kohei Yoshida
293413d13b Diable orcus on cygwin, OS X, iOS and Android by default.
Change-Id: Ife2b2d00ba1439a10a61dca72a95e8cbcbd798eb
2013-09-18 22:37:58 -04:00
Kohei Yoshida
02346aa466 Add the configure bits to support --disable-orcus.
Change-Id: Ieeb1581187248875ca2e37278c62a382f6caa8e0
2013-09-18 22:37:58 -04:00
Matúš Kukan
b6fc0ac84c remove WITH_ACTIVEX_COMPONENT
Change-Id: I3320b3ce3307598a479dfac5b120e85441c670dc
2013-09-17 20:29:14 +02:00
Matúš Kukan
f5b840a3ee goodbye linkoo.. you have served well
This commit:
- removes linkoo and --disable-linkoo option
- removes 'dev-update' make target
- creates --disable-ooenv option
- removes LD_LIBRARY_PATH and PATH settings in ooenv

Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
2013-09-17 19:37:42 +02:00
Michael Stahl
df52c9f477 python3: fix the MacOSX build here too
/usr/bin/install -s will invoke "xcrun strip", and there are a few
hardocded install_name_tool left.

Change-Id: I839af379320b4886c45a12c9a1d4fa88d2ef0059
2013-09-13 22:34:42 +02:00
Tor Lillqvist
d042e96658 For fun, handle --enable-64-bit for iOS, too
Change-Id: I745d51c5b8f4296c00ae1b652b42a311d89a0ed9
2013-09-13 19:57:58 +03:00
Tor Lillqvist
bf57f81bec Use consistent indentation
Change-Id: I2989e2aea344a7079a6da158ca318c3496c813ff
2013-09-13 19:57:58 +03:00
Michael Stahl
79fc9b9250 configure: also cure nm's malformed object disease
Change-Id: Idedefb7bdd37ba2039112707510afc030718e281
2013-09-13 17:46:56 +02:00
Michael Stahl
4956d0667d configure: ensure that install_name_tool matches the toolchain...
... used to build, since otherwise it'll break with "malformed object"
errors.  Alo replace now unused XCRUN variable.

Change-Id: I58a20c34f903b7a7acb46597d94243389e6b3842
2013-09-13 17:39:34 +02:00
Michael Stahl
d52182d364 argh /me stupid
Change-Id: If77e1165efec7e8ef008beaeb4e6d17997ee416c
2013-09-13 17:15:10 +02:00
Michael Stahl
191cf11529 configure: find MacOSX SDKs in /Applications/Xcode.app/Contents/Developer
... and also export DEVELOPER_DIR so that xcrun returns CC and CXX
values that match each other and the found SDK too, which was not
previously the case on oddly set up machines with multiple SDKs.

Change-Id: Iaed362b369b558b706926f1d15d170db580a4724
2013-09-13 17:09:10 +02:00
Stephan Bergmann
68e2a4e41d Revert "Visibility doesn't seem to work as we want in Apple's Clang"
This reverts commit e5143062887093037cab8f936288af8408576ea8; not sure what
problems exactly it was supposed to work around, but at least a "make check"
against Apple's Clang "Apple LLVM version 4.2 (clang-425.0.28) (based on LLVM
3.2svn)" on Mac OS X 10.8 works flawlessly.

Conflicts:
	configure.in

Change-Id: Ib7c80dd29e9e7a92b90be3919cd097b7e64883a1
2013-09-11 20:24:16 +02:00
Stephan Bergmann
b5e77357f8 Towards a working instdir for Mac OS X: some LIBO_URE_BIN_FOLDER fixes
Change-Id: I0583136acd5d92101ad1a23392735ed76581c0b8
2013-09-11 07:29:20 +02:00
Michael Stahl
21eae1933c configure: PRODUCTNAME changes on --enable-release-build,
... not on --enable-dbgutil as erroneously assumed in
2c1f814d36.

Apparently the other (non-naming) changes of omitting --enable-release-build
are "DEVELOPMENTPRODUCT 1" which causes "WRITE_REGISTRY" to be set to 0 and
"LOCALUSERDIR $ORIGIN/..".

Change-Id: Ib3ea3b7f21523773490836853d155985b68719ee
2013-09-10 22:54:33 +02:00
Michael Stahl
3cc8feff1b gbuild: fix Jar layers for WNT
Change-Id: I516abd165f947c155f3e969e27f51fb093bfa8fc
2013-09-09 22:09:15 +02:00
Matúš Kukan
2e5af9dc4f properly generate rc files
Change-Id: I1152270fe9579bc1f5eeab0d1a1d4b9673f6a7ad
2013-09-09 22:09:10 +02:00
Michael Stahl
2c1f814d36 change PRODUCTNAME for --enable-dbgutil build
The previous commit changed several nodes in main.xcd from
LibreOfficeDev to LibreOffice; revert that.

Change-Id: Ib1c114a0716a6a930c52c9c9a9144154fcb3934d
2013-09-09 22:09:07 +02:00
Matúš Kukan
2e47462d07 jvmfwk: install also into instdir
Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7
2013-09-09 22:09:00 +02:00
Matúš Kukan
dca003a486 install images with filelists
Change-Id: I3946b44838c659cad12d288c8a1ed5137c3e554e
2013-09-09 22:08:59 +02:00
Khaled Hosny
e4a1acd396 Check for FT_Face_GetCharVariantIndex at build time
No more dlsym() hacks. The downside is that LibreOffice built on systems
with old FreeType will not be able to use FT_Face_GetCharVariantIndex()
on newer systems, but most Linux users use their distribution builds
anyway.

This only affects the use of Unicode Variation Selectors which is an
exotic feature that wasn't even supported on Linux before 4.1.

Change-Id: I674822ef5bc8d7940a821a01cc85ae7a6d39a80e
Reviewed-on: https://gerrit.libreoffice.org/5844
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-06 19:16:21 +00:00
Michael Stahl
791a8b96f7 Revert "fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters"
This reverts commit ac4e19f908.

Unfortunately does not work if BUILDDIR is different from SRCDIR.
2013-09-05 18:17:00 +02:00
Tor Lillqvist
ac4e19f908 fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters
The $(share_subdir_name) things in the filter fragment .xcu files didn't
actually work it seems. But anyway, it's a bit silly to do expansion at
run-time of $(foo) things known at build-time anyway. Thanks to sberg for
pointing this out.

So just use the normal configury .in mechanism for these. Simpler.

Change-Id: I14b3e5cc5169b34df8a1d7ff07cc28452c67bcc8
2013-09-05 13:34:25 +03:00
Andrzej J.R. Hunt
290bfcd2fd Remove unneeded configure.ac firebird parts.
Change-Id: I2a6997d62d4e12d67261fbfe07e71fbd816cde04
Reviewed-on: https://gerrit.libreoffice.org/5807
Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
2013-09-04 11:46:49 +00:00
Khaled Hosny
190506425c Require FreeType >= 2.2.0
That should be older than what RHEL-5 have, so closer to our real
baseline. Cleanup checks for older FreeType as a side effect.

Change-Id: I10dc6a3064b6be88cd7bdc72c501d50df4a2613b
Reviewed-on: https://gerrit.libreoffice.org/5804
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-09-04 11:01:28 +00:00
Cédric Bosdonnat
b24c15f2e3 Switched to use libcmis' future 0.4.0 code
This means that building with internal libcmis won't work. Make install
libcmis master code and use --with-system-libcmis to build after this
commit

Change-Id: I3df31b299cfc462436681bb36a62c626b3ce3dfe
2013-09-02 13:51:50 +02:00
Norbert Thiebaud
4ef149ba72 misc unnecessary FALSE: Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I96cadd25f1c26fd620701a377ca20702ea969460
2013-08-30 23:20:24 -05:00
Norbert Thiebaud
81510ee8a5 ENABLE_LOCKDOWN Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I47b2d7a59bbf1f5a96523d451c8b6f4fa12c8e90
2013-08-30 23:12:19 -05:00
Norbert Thiebaud
7c88b25b9e ENABLE_PACKAGEKIT Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I966f70b17ce9be2c0db015db88dd09ed01dd6387
2013-08-30 23:05:04 -05:00
Norbert Thiebaud
e4aac6daea ENABLE_MACOSX_MACLIKE* Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I0c51975c1c13dbd100bbd8e6103835ce8a8c3691
2013-08-30 23:02:44 -05:00
Norbert Thiebaud
94730f3590 ENABLE_MARIADBC Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: Icd6f385a8c9fcb67d2e448580e66ab97f63a99a6
2013-08-30 22:25:51 -05:00
Norbert Thiebaud
5b7dff553c ENABLE_MACOSX_SANDBOX Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: Ice05796a9887c4ff311b78fcddd9820e0f06e7f1
Reviewed-on: https://gerrit.libreoffice.org/5708
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-08-30 19:59:54 +00:00
Norbert Thiebaud
aa05e128de ENABLE_MINIMIZER Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I10c52844c6e83f6b88cf736c03d93e710a69432a
Reviewed-on: https://gerrit.libreoffice.org/5705
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-08-30 19:59:41 +00:00