Commit graph

464 commits

Author SHA1 Message Date
Tor Lillqvist
a7fe1a0a08 Bin an obsolete X11 on MacOSX related bit 2011-11-30 21:52:33 +02:00
Tor Lillqvist
b2dbb20fd8 Fix indentation 2011-11-30 21:52:32 +02:00
Tor Lillqvist
daab827fd1 Don't add nonexistent Java files and dirs to various env vars 2011-11-30 21:52:31 +02:00
Bjoern Michaelsen
d73e574d8a move reconfigure into gbuild 2011-11-29 17:25:14 +01:00
Kalman Szalai - KAMI
8aa73a8f74 Add enable-oxygenoffice configure switch
Now only handling brand downloading
2011-11-29 17:14:44 +01:00
Bjoern Michaelsen
536bf877b7 respect DO_FETCH_TARBALLS again 2011-11-29 13:15:42 +01:00
Tomas Chvatal
b8a2970f24 Export DO_FETCH_TARBALLS in set_soenv. 2011-11-29 13:09:06 +01:00
Jan Holesovsky
4c41530eed Use the build.pl parallelism again. 2011-11-28 21:30:32 +01:00
Norbert Thiebaud
bc78ac68c2 render the --enable-pch option inert. 2011-11-27 11:26:01 -06:00
Tomas Chvatal
07f2c05391 Make SampleICC switchable between system and internal one. 2011-11-23 16:44:39 +01:00
Andras Timar
949ee7c308 add --enable-silent-msi configure switch
On Windows it is now configurable to create an MSI installer
which installs LibreOffice without user interaction.
2011-11-18 23:47:35 +01:00
Lionel Elie Mamane
7bab4645ce Implement --with-sytem-postgreql and --with-libq-path; cleanup unused #define 2011-11-17 23:17:21 +01:00
Norbert Thiebaud
ab91d708e1 make postgresql-sdbc connectivity optional 2011-11-17 21:15:33 +01:00
Lionel Elie Mamane
c0cfd08040 Apply sdbc-postgresql-config_office.diff 2011-11-17 21:15:13 +01:00
Felix Zhang
eacfa0f77c removing obsolete layout code 2011-11-15 14:39:55 +01:00
Jan Holesovsky
f616f50507 Check for the missing MSVC 2005 runtime libs.
They are needed for the pre-built Mozilla libs.
2011-11-15 11:48:43 +01:00
Jan Holesovsky
7af550496f Fix location of the prebuilt mozilla files. 2011-11-15 07:51:52 +01:00
Caolán McNamara
f163867ff4 Link with libXrender instead of dynamically open it
Let's not mess around dlopening it and leaving gaps
in the support whereby we currently require it to
exist either linked or "dlopenable+display supports it"
with dlopenable + display doesn't support it leaves
a crashing gap where there are no appropiate checks
for that case.
2011-11-14 07:35:58 +00:00
Tor Lillqvist
47b383087d Avoid silly -Lno_x_libraries (for Android, which is Linux, but without X11) 2011-11-14 01:55:01 +02:00
Tomas Chvatal
db7ab4ac14 Add nsplugin switch so we dont bind nsplugin building to gtk switch. 2011-11-11 15:51:10 +01:00
Tor Lillqvist
32e173b865 There is never any solver/$INPATH/include as far as I know 2011-11-10 13:45:07 +02:00
Tor Lillqvist
3a28346b21 Avoid silly -Ino_x_includes in $SOLARINC 2011-11-10 13:45:06 +02:00
Tor Lillqvist
71cbcb6202 Move solenv/$OUTPATH/inc to solenv/inc/$OUTPATH
In a --enable-dbgutil tree, "make clean" will remove solenv/$OUTPATH.
2011-11-10 13:45:05 +02:00
Tor Lillqvist
e68a920f72 solenv/inc/Xp31 is crack 2011-11-10 13:45:04 +02:00
Norbert Thiebaud
ddb68b2ead MacOSX doesn't support X based build anymore, stop pretending in set_soenv 2011-11-10 00:34:47 -06:00
Tomas Chvatal
bdead69dd3 Add switch for system/internal npapi.h
This commit also update the internal includes to latest mozilla ones
including the .c{,pp} file updates.

The ldap check is also simplified from 2 check into plain one.
2011-11-08 01:01:11 +01:00
Rene Engelhard
a592509588 remove obsolete @SYSTEM_TRANSLATE_TOOLKIT@ from set_soenv.in 2011-11-02 17:35:05 +00:00
Tomas Chvatal
f6f5c89259 Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec.
This also finishes the uncoupling of NSS from the --with-system-mozilla.
2011-11-02 17:37:53 +01:00
David Tardon
1b717cee8c export DBUS_{CFLAGS,LIBS} 2011-11-02 13:26:53 +01:00
Stephan Bergmann
fc98a97135 Introduced --disable-linkoo. 2011-10-20 23:04:12 +02:00
Norbert Thiebaud
aa09a9b77d bootstrap.1 is not usefull anymore use bootsrap directly 2011-10-07 15:27:32 -05:00
Fridrich Štrba
3b53c579ce Fix Windows build and enable CMIS inconditionally
Since the provider should now build everywhere,
enable it inconditionally to catch minor problems
2011-10-05 13:05:01 +02:00
Fridrich Štrba
e531e8abae LIBVISIO_* -> VISIO_* to avoid eventual conflict with pkg-config danse 2011-10-05 10:36:16 +02:00
Fridrich Štrba
e991bba4ef LIBWPS_* -> WPS_* to avoid eventual conflict with pkg-config danse 2011-10-05 10:36:16 +02:00
Fridrich Štrba
62c43b44ff LIBWPG_* -> WPG_* to avoid eventual conflict with pkg-config danse 2011-10-05 10:36:15 +02:00
Fridrich Štrba
8703f3e358 LIBWPD_* -> WPD_* to avoid eventual conflict with pkg-config danse 2011-10-05 10:08:58 +02:00
Cédric Bosdonnat
5bd2890a56 Added --disable-cmis flag for use while the feature is too unstable 2011-10-04 09:38:36 +02:00
Jan Holesovsky
b08a764af9 Fix the build / host confusion around icu tools. 2011-10-03 14:10:57 +02:00
Rene Engelhard
ba44f8805b add --with-system-libcmis 2011-10-02 21:36:48 +00:00
Cédric Bosdonnat
7e60b29fa1 ExternalLib: add the include folder to the default includes 2011-10-01 19:05:06 +02:00
Jan Holesovsky
3927d9bd2a Add support for bundling the -system .dll's into the MinGW builds. 2011-09-30 21:11:26 +02:00
Stephan Bergmann
979e2c8f8b -fthreadsafe-statics uses a single lock on Mac OS X and thus leads to deadlock. 2011-09-30 15:37:11 +02:00
Caolán McNamara
db84cf1771 bump to libexttextcat
As an aside we can always use the configuration and data files belonging to the
system version now in --with-system-libexttextcat mode, so need for the --data
option.
2011-09-23 14:02:54 +01:00
Jan Holesovsky
3540bfb994 Always output AWTLIB, gbuildized 'bean' depends on that. 2011-09-20 00:51:38 +02:00
Baptiste Daroussin
f2f9e520ba Fix soenv for FreeBSD 2011-09-19 15:53:57 +02:00
Tor Lillqvist
02c29d0bb2 Drop unused WinFormat function 2011-09-19 10:54:04 +03:00
Tor Lillqvist
d6c245d87c Drop ActiveState Perl support
Why make life harder on purpose? On Cygwin, we support the Cygwin
Perl, period.
2011-09-19 10:48:46 +03:00
Tor Lillqvist
43d7604a23 Avoid reordering elements already in PATH for Cygwin
For instance: If we have /opt/lo/bin in PATH already in front of
/usr/bin, we don't want to put /usr/bin in front of it again.
2011-09-19 10:41:45 +03:00
Tor Lillqvist
410499bd40 Surely /usr/bin already is in PATH on Cygwin
It would be a weird PATH otherwise. (And if that is the case,
presumably there is a good reason for it, then, and we shouldn't force
/usr/bin there.)
2011-09-19 10:24:13 +03:00
Tor Lillqvist
f0d4c09228 Bin weird leftover from OOo's native MinGW thing
I don't see the need to explicitly prefix PATH with /usr/bin in the
generated 'bootstrap' file. Surely /usr/bin is in PATH anyway for any
sane setup, and if there are other directories in front of it in PATH,
that is then on purpose.
2011-09-19 09:50:17 +03:00
Tomas Chvatal
a7d38f57cc Revert "Remove once again the INSTALLDIR feature"
This reverts commit bf0ea5c4ee.

Those variables are used in bin/distro-install-*.
Unable to find any issue with both distro-install and dev-install so
reverting.
If something really does break it needs fixing. Reverting this is not
an option.
2011-09-18 11:04:29 +02:00
Stephan Bergmann
cf8a59c77a Removed no longer needed PROFULLSWITCH. 2011-09-16 13:50:07 +02:00
Andras Timar
caf8c8f423 typo fix 2011-09-13 11:08:28 +02:00
Norbert Thiebaud
9092f1f0d3 provide instructions to install a linreoffice-custom gnumake 2011-09-10 18:36:32 -05:00
Michael Meeks
f2cc639131 Add detection of stale / slow makes (for Windows) and warn about them. 2011-09-10 16:52:06 +02:00
Andras Timar
ae4ad0eabe extend branding options in configure 2011-09-01 09:39:11 +02:00
François Tigeot
dec4bf14c8 Remove the almost always empty '350' directory
It's better to use two completely separate source trees than to try to
build two different versions of LibreOffice in the same one
2011-08-30 16:43:01 +02:00
Tor Lillqvist
5007d5c543 MinGW cross-compilation improvements
Make sure the MINGW_FOO environment variables get set and propagated
to the build environment also in the MinGW cross-compilation case. The
OOo code used to do that for MinGW natively on Windows (under
Cygwin). (Which we don't intend to support.)

Now, whether the *use* of these variables in the various makefiles etc
is relevant any more remains to be seen. I suspect all that might well
be unnecessary, as we after all are capable of cross-build the code
using MinGW just fine currently with none of these MINGW_FOO being
set.

One place where at least MINGW_GCCDLL and MINGW_GXXDLL is needed,
though, is in scp2. We presumably do want to include these DLLs (the
shared libgcc and libstdc++) in the installation set, to the extent
the scp2 stuff can be used still in a MinGW cross-build context.
2011-08-29 20:39:01 +03:00
Matúš Kukan
a6bea2c8f6 we are not using this GLIBC variable 2011-08-29 16:35:09 +02:00
Tor Lillqvist
eefc25d1d2 Bin USE_MINGW
Its alternative values as used by OOo is irrelevant to us as we don't
intend to support building using MinGW on Windows itself. To us, MinGW
always means cross-compilation. For us it is enough to look at
$(OS)$(COM), and WNTGCC always implies cross-compilation.

(OOo on the other hand attempts to support use of the Cygwin gcc with
the -mno-cygwin option (which is practically considered an obsolete
option), the normal MinGW compiler (but still from Cygwin), but not
cros-compilation.)
2011-08-26 20:54:59 +03:00
Matúš Kukan
75fac98397 Add support for creating merged library.
This commit allows to set which libraries to merge
and creates merged library in tail_build if enabled.
This should save time when loading libraries in application
and also makes more sense for link-time optimization.

Signed-off-by: Michael Meeks <michael.meeks@novell.com>
2011-08-24 14:23:43 +01:00
Rene Engelhard
c02eaf4bb9 fix $JRELIBDIR/$JRETOOLKITDIR/$JRETHREADDIR for mips(el) (missing /jre) 2011-08-23 18:15:13 +02:00
Rene Engelhard
260088aaf0 export WORDS_BIGENDIAN in set_soenv and make graphite2 use it 2011-08-23 18:15:13 +02:00
François Tigeot
bf0ea5c4ee Remove once again the INSTALLDIR feature
It was reintroduced with a merge from the 3.4 branch
2011-08-23 14:50:49 +02:00
Tor Lillqvist
041b4805c9 Don't unset INCLUDE in each MSVC compilation, instead do it in Env.Host.sh 2011-08-23 15:05:57 +03:00
François Tigeot
7b4825af2c Enable CUPS unconditionally
It doesn't make sense to try to use anything else to print on *nix
systems these days
2011-08-22 21:11:18 +02:00
Matúš Kukan
fc41132306 enable using link-time optimization
This commit enables LTO for all shared libraries.
Build takes much longer. Use just with gcc-4.5 or later.
2011-08-22 12:54:53 +02:00
Norbert Thiebaud
d64bbd6bf8 detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set 2011-08-19 18:29:07 -05:00
Jan Holesovsky
3da919bb40 Implement AsmObject in gbuild (Windows only for now, stub for unxgcc).
This fixes the build of 'basic' on Windows.
2011-08-11 12:54:53 +02:00
Jordan Ayers
da1681af3a Remove --server mode and supporting code from build.pl. 2011-08-10 20:43:23 -05:00
Norbert Thiebaud
9b981cafaa Adjust the parallelism of tail_build to be max(max-process, num-cpus)
tail_build run mostly by itself and wrap a dozen of module,
using just MAXPROCESS for the parallelism force to limit NB_CPUS
in order to avoid a NB_CPUS x MAXPROCESS scenario.
This mitigate this problem, until we don;t need MAXPROCESS anymore
and NB_CPUS becomes the only driving force.
2011-08-09 15:52:50 -05:00
Norbert Thiebaud
49fa5b039d remove obsolete USE_CCACHE env. prefix ccache after C[C|XX] final eval 2011-08-07 20:09:24 -05:00
Kalman Szalai - KAMI
8c219766f1 Added Russian language Lightproof module
* Added module
* Remove versioned directories in scp2 module for Lightproof
2011-08-07 21:55:49 +02:00
Caolán McNamara
b83057f6a8 just check for support of -mno-avx 2011-08-04 17:05:45 +01:00
Tor Lillqvist
6b9a4d0917 Using X11 on MacOSX hasn't been supported for years 2011-08-01 01:46:14 +03:00
Miklos Vajna
832f7e574d set_soenv: remove reference to no longer existing program steps
Those were removed in commit 22d9caecc978a5739ddd1430fd26abe06454726c
already.
2011-07-31 16:51:28 +02:00
Joseph Powers
a60ce8b60d MacOS: Remove some of my changes.
tml didn't like some of them; plus, configure.in -> configure removes the
[] in if statements (atleast on my machine) so I have to use "test".

My CPATH & LIBRARY_PATH statements where unreliable; even after modifying
set_soenv.in to export them correctly. I'm currently exporting them before
the ./autogen.sh && make and things seem to work better; I'm still looking
for a better solution.
2011-07-30 17:05:32 -07:00
Joseph Powers
5e65406174 Mac OS: On 10.7, the standard search paths don't work.
Installing xCode 4.1 renames the xCode 3.2.6 directory to /Developer-old/;
however, the compiler gets confused and can't find the headers and libraries.
This patch just notifies the compiler where they are actually located.

Note: I'm assuming that people compiling on 10.7 aren't trying to generate
a PPC binary.
2011-07-29 08:36:03 -07:00
Jan Holesovsky
a95376174e Merge commit 'libreoffice-3.4.2.3'
Conflicts:
	Makefile.in
	configure.in
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	set_soenv.in
	solenv/inc/minor.mk
2011-07-28 18:33:58 +02:00
Norbert Thiebaud
b5e6d0a679 make -Wno-long-double usage conditional to gcc supporting it 2011-07-26 21:58:08 -05:00
Norbert Thiebaud
4220d91d4d oops lost the patch to export the MacOSX variable inset_soenv.in 2011-07-26 19:12:57 -05:00
Norbert Thiebaud
4f0c8067fa MacOSX configure options to support SDK and version min/max 2011-07-26 15:54:40 -05:00
Bjoern Michaelsen
13f4f7545f add dbumenugtk configure check 2011-07-26 16:05:52 +02:00
Tor Lillqvist
0368ac2adb Revert "no need for INPATH in WORKDIR anymore"
We do need to have the platform-specific part in WORKDIR, for
cross-compilation support.

This reverts commit 3c471c4a11fe58a6cd3dbf09099d9a1ecf60dd38.
2011-07-25 16:12:29 +03:00
Bjoern Michaelsen
276ba69ad2 no need for INPATH in WORKDIR anymore
* this has been obsoleted with commit 22d9caecc978a5739ddd1430fd26abe06454726c
2011-07-25 12:54:51 +02:00
Tor Lillqvist
76a27e577e Use fixed-name environment script and no source_soenv.sh
No longer call the script snippet LinuxX86Env.Set.sh,
MacOSXX86Env.Set.sh, etc, but always Env.Host.sh. No need for
source_soenv.sh then, which wouldn't have worked when cross-compiling
anyway.

(As before, when cross-compiling, the environment script snipppet for
the BUILD platform is called Env.Build.sh.)
2011-07-25 00:47:41 +03:00
Tor Lillqvist
15d5273c29 Bin pointless "nmake=dmake" alias, who needs that? 2011-07-25 00:27:11 +03:00
Bjoern Michaelsen
ae83b24660 Merge branch 'master' into feature/gnumake4 2011-07-24 19:22:58 +02:00
Bjoern Michaelsen
2819345cee bump workdir up a few levels 2011-07-23 15:59:33 +02:00
Caolán McNamara
d1f6403c9e ENABLE_DEBUG_STL isn't working out for us, too easy to mix with and without 2011-07-22 11:28:03 +01:00
Tor Lillqvist
3d12239031 Using -L/lib and -L/usr/lib on MacOSX builds is unnecessary and wrong
As we build against the MacOSX 10.4 SDK we should certainly not link
against any libraries of the build OS, which could well be 10.5, 10.6
or 10.7.

Norbert verified that this works fine.
2011-07-21 22:20:05 +03:00
Bjoern Michaelsen
5012e466ce resyncing to master 2011-07-21 18:27:57 +02:00
Tor Lillqvist
649a3a4181 Propagate DISABLE_ACTIVEX also in the WNTGCC case 2011-07-21 17:43:39 +03:00
Matúš Kukan
6f0156d40c revert some mismerges in set_soenv.in 2011-07-21 10:38:18 +02:00
Mike Eberdt
fe6dcc2e1b accept x86_64 for FreeBSD as well 2011-07-12 09:08:37 +01:00
Petr Mladek
8124bdf39b better support for distro packaging
This is port from the build repo. The main differences are:

    + splits package-ooo into several scripts (bin/distro-install-*)

    + renames many variables to avoid OOO prefix and to better fit
      the variables produced by the current bootstrap configure.in

    + uses OOO_VENDOR from bootstrap/configure.in to add distro specific hacks;
      the conditions have been updated only for "Novell, inc."

    + install most of the desktop integration from sysui using
      sysui/desktop/share/create_tree.sh

    + do not install two extra templates:

         $OOINSTBASE/basis$VERSION/share/template/en-US/forms/resume.ott
         $OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott

      should get merged with other templates

    + do not install pyunorc-update64;

      it is needed only when you want to run 32-bit LO on 64-bit system;
      is anyone using it?

    + do not call install-dictionaries:
    + do not call build-galleries:

      is anyone using them?

    + do not install ootool and ooconfig

      is anyone using them? are they still working?

Signed-off-by: Michael Meeks <michael.meeks@novell.com>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@gmail.com>
2011-07-11 20:30:31 +02:00
Tor Lillqvist
3f086957df Don't use -L /usr/lib when building for iOS 2011-07-09 13:37:20 +03:00
Tor Lillqvist
7c46fa4494 Most likely pointless to pass -I $COMPATH/include when using gcc
Surely gcc finds its default header location anyway.
2011-07-03 16:47:19 +03:00
Caolán McNamara
e214780d71 fix stray define 2011-06-30 11:32:27 +01:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00