Commit graph

64 commits

Author SHA1 Message Date
Norbert Thiebaud
ea1f0f94fc fix 1eabd795b959830b74c3f3036fefeb143448d898 bad \ 2011-06-18 14:22:08 -05:00
Norbert Thiebaud
1908ff8ea7 do not clean dmake if we use the system one 2011-06-18 14:09:50 -05:00
Tor Lillqvist
09600160cd Choose build.pl or make automatically in cross-build-toolset 2011-06-18 22:02:15 +03:00
Tor Lillqvist
afdd56e37f Add lucene, berkeleydb and l10ntools to cross-build-toolset, sigh 2011-06-17 03:04:47 +03:00
Tor Lillqvist
5c4d54740e Add idl to cross-build-toolset, we need svidl 2011-06-17 01:23:31 +03:00
Tor Lillqvist
602bc9d3c4 Add icc to cross-build-toolset 2011-06-16 21:47:42 +03:00
Caolán McNamara
d3afc46316 add experimental callcatcher target 2011-06-16 09:13:55 +01:00
David Tardon
2e581960e5 need tab here 2011-06-16 07:08:35 +02:00
Robert Nagy
6fdc8ae0d1 only fetch external tarballs if --disable-fetch-external is not defined 2011-06-15 12:51:41 +02:00
Tor Lillqvist
79dfc54b21 Fix comphelper in cross-build-toolset 2011-06-13 15:45:15 +03:00
Tor Lillqvist
5c247d22c5 Need setup_native for ulfconv, at least for now 2011-06-12 19:23:29 +03:00
Tor Lillqvist
b9d614cb02 Add sax and stoc, use merged list in cross-build-toolset 2011-06-12 16:00:11 +03:00
Tor Lillqvist
920595ecce Add "rsc" to cross-build-toolset 2011-06-12 14:53:00 +03:00
Tor Lillqvist
1d7a9b3045 Typo 2011-06-12 01:39:06 +03:00
Tor Lillqvist
4a69f1a50d Add "tools" and its dependencies to cross-build-toolset 2011-06-12 01:36:35 +03:00
Tor Lillqvist
2f2b324ce7 Explicitly list modules in cross-build-toolset 2011-06-12 01:21:44 +03:00
Tor Lillqvist
36372364ab Add i18npool to cross-build-toolset
The list of modules built in the cross-build-toolset target, many with
--all, is getting a bit unwieldy. Should do this in a cleaner way,
with a for loop, and avoiding multiple invokations of build.pl --all,
instead just figure oiut a clever way to get the definite list of
individual modules needed, in the correct order.
2011-06-08 00:25:41 +03:00
Tor Lillqvist
777095627d Add unodevtools to cross-build-toolset 2011-06-08 00:03:36 +03:00
Tor Lillqvist
161882e76d Add autodoc to cross-build-toolset 2011-06-07 01:04:09 +03:00
Tor Lillqvist
2fbf02f9f1 Add dictionaries to cross-build-toolset 2011-06-07 00:09:34 +03:00
Tor Lillqvist
73bedae49a Add gettext to cross-build-toolset 2011-06-06 16:08:31 +03:00
Tor Lillqvist
8ec8a6bb0d Add glib to cross-build-toolset as the glib configury needs glib-genmarshal 2011-06-06 02:02:06 +03:00
Tor Lillqvist
ffa0bd23f0 Build and deliver for the build platform also in codemaker 2011-06-06 01:19:18 +03:00
Francois Tigeot
66b2e5a82f Revert changes introduced with the merge of OOo dev300_m106
They break installation
2011-06-05 09:04:07 +02:00
Tor Lillqvist
5dffecb3d3 Build more stuff in cross-build-toolset 2011-06-05 02:22:35 +03:00
Tor Lillqvist
bc20215a2b Build more stuff in cross-build-toolset 2011-06-05 02:02:14 +03:00
Tor Lillqvist
f206336a25 Rehash of cross-compilation ideas
Like in my previous plan, when cross-compiling we run the same
configure script separately for a native build configuration on the
build platform, in a temporary subdirectory.

Now use a fixed name "CONF-FOR-BUILD" for that subdirectory, so that
it is easy to edit out that path component from those build
environment variables that contain it.

Pass more of the native build environment variables up to the main
configure and propagate those to the build environment suffixed with
_FOR_BUILD: INPATH, OUTPATH OUTDIR, PATH, SOLARINC, SOLARLIB,
WORKDIR. Whether these all will actually be needed remains to be seen,
the set can be reduced later.

The environment setting file (*Env.Set.sh) for the native build is
copied here to the top directory under the name Env.Build.sh, and the
environment variables set in it that contain pathnames are modified to
point directly to this top directory, not the temporary CONF-FOR-BUILD
subdirectory.

When doing a cross-compiling build, we first do a build of the
necessary build-time tools for the build platform. This is done in the
same source tree. As the directories where build results are stored
include the platform specification (OUTPATH or in some cases INPATH),
there should be no clashes.

Don't run the download script from ./bootstrap(.1). We are running it
from Makefile already anyway often enough. This could also do with
some clean-up; the ./g -f clone phase is a bit slow, I am not sure if
it really is necessary every time? Also, we should not overwrite
ooo.lst if its contents isn't changing.

Use INPATH_FOR_BUILD in SOLARBINDIR so that the self-built tools like
idlc that we run are for the build platform, not the host
platform.

Attempt to get rid of the makefile.rc and makefile.mk files. Surely it
should be enough with just Makefile(.in) (and then GNUmakefile.mk for
its own so far special gbuild purposes). Instead of invoking dmake to
do "clean" or "distclean" from Makefile(.in), we already just do the
same directly in Makefile(.in). This way we don't need to first build
dmake in order to be able to do a make clean, which will then finally
clean out dmake again;)

Ideally I would like to get rid of bootstrap(.1), too. It should be
possible to merge its tasks into configure(.in) or Makefile(.in) as
appropriate.

And actually, maybe also what set_soenv(.in) does could well be merged
into configure(.in)?
2011-06-04 19:08:44 +03:00
Tor Lillqvist
108e05c56d Tell to run LibreOffice.app on MacOSX, not soffice.bin 2011-06-01 02:27:25 +03:00
Jan Holesovsky
e72584561e Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-05-27 20:49:08 +02:00
Jan Holesovsky
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk
2011-05-27 20:39:04 +02:00
Michael Meeks
ec87d03ed6 append subsequenttests to check: as per mailing list discussion 2011-05-26 11:53:28 +01:00
Caolán McNamara
4fe673f6fa need to escape this differently when spawning off shell 2011-05-25 22:53:06 +01:00
Caolán McNamara
b6004db120 run this headless 2011-05-25 09:23:06 +01:00
Cédric Bosdonnat
8d8b2166e6 symlink the install in install folder like before 2011-05-24 18:25:59 +02:00
Michael Meeks
323303a408 add 'make test' to run subsequenttests 2011-05-24 15:33:07 +01:00
Bjoern Michaelsen
7f99f234e0 make dev-install use smoketest 2011-05-23 11:28:35 +02:00
Tor Lillqvist
84fbaed77d More cross-compiling work
AC_SUBST also EXEEXT_FOR_BUILD and use that in Makefile.in.

As winemv.set.sh is now called WindowsMSVCEnv.Set.sh, with capital E
and S like all the others, we can simplify the glob pattern for the
Set.sh file.

Don't attempt to download and/or run unpackers for dependencies
relevant only when using MSVC if using MinGW.

Misc other Windows host vs. build fixes.
2011-05-17 02:22:19 +03:00
Hanno Meyer-Thurow
eed8e0b62e make the installation dir better configurable
install to %libdir% intead of %prefix% as it is usual for other projects;
use the usual DESTDIR instead of OODESTDIR

Note that the default installation path is /usr/local/lib/libreoffice;
it can be redefined by --prefix, --libdir, --with-install-dirname
configure options

Some of these changes contributed by Petr Mladek <pmladek@suse.cz>
2011-04-20 15:30:08 +02:00
Norbert Thiebaud
616c1d36f8 support USE_GMAKE=1 envvar to build with gmake the modules that can be. 2011-01-10 21:36:56 -06:00
Christian Lohmaier
cca3388bd4 small fixes to allow using --with-linked-git & --with-external-tar 2011-01-08 18:45:25 +01:00
Caolán McNamara
772377975a give make check the same depends 2010-12-21 13:16:49 +00:00
Caolán McNamara
844b6b695b run autogen if configure.in, etc. changed since Makefile was generated 2010-12-16 10:18:20 +00:00
Thorsten Behrens
c1030a6bf9 Migrate id, tags, and docs make target over from build repo
* make id: create GNU idutils symbol lookup index
* make tags: create ctags index file (c++, java, html)
* make docs: create doxygen-style documentation below docs/
2010-12-13 23:08:58 +01:00
Robert Nagy
438bff402f unbreak the install target by adding the missing && token 2010-12-07 21:05:41 +01:00
Thomas Klausner
3db757f687 Use bash as shell for this Makefile.
Using /bin/sh, this breaks on NetBSD (not even dmake is built).
2010-12-07 10:54:30 +01:00
Caolán McNamara
d3f104d48f make smoketest use ooinstal to build its install set 2010-12-02 14:06:21 +00:00
Michael Meeks
03f97b302d fix fetch rule 2010-12-02 12:07:12 +00:00
Michael Meeks
a22c7cb5f3 split downloading down into a separate 'fetch' rule 2010-12-02 10:47:33 +00:00
Jan Holesovsky
9c0035f024 Makefile.in: Introduce the 'install' target.
You can use it like 'make install', or 'make install prefix=/path', to override
what has been set by ./configure.
2010-12-01 11:14:57 +01:00
Jan Holesovsky
79aced7682 Makefile.in: Add a missing '--' delimiter, so that -P@...JOBS@ goes to dmake. 2010-11-25 17:14:17 +01:00