Commit graph

400 commits

Author SHA1 Message Date
Norbert Thiebaud
3f2ff54778 remove pch from the include list 2011-11-27 15:24:45 -06:00
Norbert Thiebaud
e4610ffd2d remove PCH support in dmake-module 2011-11-27 12:26:12 -06:00
Stephan Bergmann
70a6b9ffbd New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
  cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
  addressed.
* Some replacements tools String -> rtl::OUString.
2011-11-22 09:41:47 +01:00
Felix Zhang
eacfa0f77c removing obsolete layout code 2011-11-15 14:39:55 +01:00
Stephan Bergmann
c1bd2a254b New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous. 2011-11-10 13:36:20 +01:00
Stephan Bergmann
d03465a446 Undo basis/brand split: removed RPATH BRAND (same as OOO now). 2011-10-24 22:56:48 +02:00
Stephan Bergmann
fd1db0b8eb Undo basis/brand split: move program/classes/ from basis to brand.
Also removed apparently unused UNO_JAVA_COMPPATH ProfileItem.
2011-10-18 12:52:06 +02:00
Tor Lillqvist
946f3451e1 I don't think _DLL_ has any meaning either 2011-10-03 11:00:44 +03:00
Tor Lillqvist
6e1a8ad89e Bin Hamburg "build server" and BSCLIENT stuff 2011-10-03 10:37:34 +03:00
Tor Lillqvist
c8a12c1662 No need for -DSHAREDLIB, not tested in any source file 2011-10-03 10:37:32 +03:00
Tor Lillqvist
bc88d9b76d No need for -DCUI or -DGUI 2011-10-03 10:37:27 +03:00
Caolán McNamara
572f5fc11f comment typos 2011-10-01 15:35:20 +01: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
Andras Timar
05293cb04c remove checks for unused BUILD_SPECIAL environment variable 2011-09-28 13:48:10 +02:00
Stephan Bergmann
a66f9903bb Undo basis/brand split: move dynamic libraries from basis to brand. 2011-09-23 17:55:39 +02:00
Stephan Bergmann
b1f4e8424b Removed unused BOXT feature. 2011-09-20 19:25:42 +02:00
Stephan Bergmann
966f3c0f6d Removed --leak-check=yes from CppUnit valgrind/memcheck calls.
Can be enabled via VALGRIND_OPTS=--leak-check=yes.
2011-09-19 21:40:11 +02:00
Tor Lillqvist
c1c99bf42c Cosmetics: Don't bother with -D$(GUI) if $(GUI)==$(OS) anyway 2011-08-15 16:37:08 +03:00
Tor Lillqvist
ce31567afb Goodbye to CWS_WORK_STAMP 2011-07-01 15:37:03 +03:00
Tor Lillqvist
0fa4a7dcab Use correct CPPLCC when cross-compiling 2011-06-23 19:04:12 +03:00
Tor Lillqvist
eb0138502a Add EXECPOST_FOR_BUILD 2011-06-21 15:22:01 +03:00
Tor Lillqvist
dc4b364172 Need to special-case AUGMENT_LIBRARY_PATH for cross-compilation to Windows, sigh 2011-06-18 00:25:56 +03:00
Caolán McNamara
4dfe99b886 add GLIBCXX_FORCE_NEW for memcheck 2011-06-17 13:57:11 +01:00
Tor Lillqvist
b1fd3cc07a Don't run any cppunittester when cross-compiling 2011-06-17 03:14:32 +03:00
Tor Lillqvist
9e4e88567e Add MISC_FOR_BUILD variant 2011-06-14 02:26:01 +03:00
Tor Lillqvist
131801813d Bye bye hbtoolkit whatever you are 2011-06-08 11:48:00 +03:00
Caolán McNamara
60daef4bce fix i18npool build, fill in other branches too 2011-06-08 09:28:09 +01:00
Tor Lillqvist
73d5300d92 Add FOR_BUILD versions of OUT and LOCAL_OUT 2011-06-07 00:09:38 +03:00
Tor Lillqvist
5454f68e65 Use the build platform SOLARLIB for SOLARSHAREDBIN 2011-06-05 01:28:11 +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
a7ce3066cd Drop the TARGETPLATFORM idea 2011-06-04 19:08:40 +03:00
Francois Tigeot
eb5217de96 Unify DLLPOSTFIX value on all platforms.
There is no justification for changing some shared library file names
depending on the platform used.
2011-06-02 14:37:34 +02:00
Jan Holesovsky
07c1d34ec7 Merge commit 'libreoffice-3.4.0.2'
Conflicts:
	configure.in
	distro-configs/LibreOfficeMacOSX.conf
	distro-configs/OxygenOfficeLinux.conf
	distro-configs/OxygenOfficeWin32.conf
	download
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	set_soenv.in
	solenv/bin/modules/installer/download.pm
	solenv/gbuild/CppunitTest.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
2011-05-31 10:45:37 +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
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
Tor Lillqvist
85d44913ab Minor tweaks for cross-compiling
Still a long way from working, of course.

The configure script now runs to finish on Linux with --host=mingw32.

It is no longer an error if Windows SDK or DirectX SDK are not found
by the logic in the configure script. It might well be that the user
has included relevant -I and -L flags in CC or CXX that makes the
compilations work anyway, or something. We should not try to be too
clever and try to predict how the compiler or linker work in the
configure script.

We now define the FOO_FOR_BUILD environment variables in set_soenv.in
even when not cross-compiling (identically as the plain FOO ones in
that case, obviously). This should make some makefiles and stuff that
build tools to run on the build host a bit simpler.
2011-05-16 18:55:07 +03:00
Tor Lillqvist
f6aed99734 Set some FOO_FOR_BUILD variables also when not cross-compiling 2011-05-16 00:00:59 +03:00
Tor Lillqvist
d8f4b788c7 Propagate FOO_FOR_BUILD variables when compiling for the build system 2011-05-15 04:29:23 +03:00
Tor Lillqvist
c4e2af8493 Fix typo 2011-05-13 21:52:59 +03:00
Tor Lillqvist
eaf8e0939a Some initial baby steps towards cross-compilation
And some baby steps for cross-compiling for iOS in particular.
2011-05-13 20:24:40 +03:00
Andras Timar
2f734f54a6 put L10N_MODULE definition to set_soenv instead of settings.mk
and remove alternative l10n locations from settings.mk
2011-04-28 18:12:39 +02:00
Andras Timar
32352e1ce8 put L10N_MODULE definition to set_soenv instead of settings.mk
and remove alternative l10n locations from settings.mk
2011-04-26 10:27:13 +02:00
Andras Timar
a765a3e7c3 fix L10N_MODULE path on Windows 2011-04-26 09:24:59 +02:00
Andras Timar
535bee89a2 fix L10N_MODULE path on Windows 2011-04-21 07:06:02 +02:00
Tor Lillqvist
dbcf68f61e Kill UPDMINOR and UPDMINOREXT stuff
As far as I know we have no intention to use that stuff. Do we ever
have any idea what it means? But sure, if it turns out that we do want
to, this commit will have to be reverted.
2011-04-18 14:05:39 +03:00
Tor Lillqvist
20ba3c4ae8 Kill OS/2 stuff 2011-04-15 14:08:09 +03:00
Francois Tigeot
08d49db2aa Remove CVER.
It is no longer used.
2011-04-14 13:41:19 +02:00
Caolán McNamara
a956d777b5 G_SLICE for memcheck only 2011-04-05 09:26:36 +01:00
Caolán McNamara
6128599cc7 tweak VALGRINDTOOL for helgrind/memcheck 2011-04-04 17:10:43 +01:00
Petr Mladek
928402389f search translated strings in the new "translations" module 2011-03-25 12:13:50 +01:00