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
Norbert Thiebaud
817da75b08
accumulate the output of modules in error in build_error.log
...
In order to provide a more targeted message with tinderbox email
each module store it's own output in a separate file, which is
accumulated in build_error.log when the module failed to build
2011-05-23 20:57:06 -05:00
Tor Lillqvist
5d50561735
Use the build OS xsltproc when cross-compiling
2011-05-24 02:48:19 +03:00
Tor Lillqvist
2a2a9c8a64
Check OS_FOR_BUILD, not (the runtime) OS
2011-05-24 02:31:48 +03:00
Tor Lillqvist
9be8ce5f9f
Improve configury for cross-compilation to iOS
2011-05-24 02:31:45 +03:00
Andras Timar
efbdaa1d5e
don't forget en-US when dev-installing ALL languages
2011-05-23 19:50:38 +02:00
Francois Tigeot
b95d086d76
Remove no longer used files
2011-05-23 18:25:20 +02:00
Tor Lillqvist
f210e2cec2
Migrate a /bin/echo change to _tg_app.mk back to tg_app.mk, and re-unroll
2011-05-23 18:54:42 +03:00
Tor Lillqvist
334d8a37dc
Re-introduce a /bin/echo change that was lost when re-unrolling tg_shl.mk
2011-05-23 18:23:28 +03:00
Tor Lillqvist
0d4191944a
Forgot to unroll tg_shl.mk after last change
2011-05-23 17:56:02 +03:00
Tor Lillqvist
bd9d0067a6
Rework DLL creation code for MinGW (cross-)compilation
...
Don't run dlltool --output-exp to create a separate object file with
just export data (.edata section). In the case where at least one
function in the objects being linked has been explicitly marked for
export, GNU ld will not look for export information in the object
files anyway. At least the GetVersion() function seems to be marked
for export explicitly. Just pass the .def file when linking.
GNU ld since 2.17 supports @cmdfile syntax, just like MSVC tools, so
no need to create a separate shell command file and source that. (Why
that even would work better than just running the ld command with a
long command line directly, I don't know.)
Actually I don't know why even bother with the @cmdfile, after all we
mainly intend WNTGCC to be used when cross-compiling, and there are no
short command-line length restrictions on modern OSes from which one
might want to cross-compile. But oh well.
Pass the necessary -L switches, i.e. SOLARLIB, when linking with GNU
ld. (For MSVC, the ILIB environment variable is used.)
Produce the import library when linking, no need to have a separate
rule to produce an import library for WNTGCC.
Re-unroll tg_shl.mk into _tg_shl.mk with the recently unbroken
mkunroll tool.
2011-05-23 17:33:49 +03:00
Tor Lillqvist
4915eb3571
Match SALHELPERLIB for WNTGCC to what we produce
2011-05-23 17:33:49 +03:00
Tor Lillqvist
63c787c51d
Match SAL_LIB for WNTGCC to what we produce
2011-05-23 17:33:49 +03:00
Tor Lillqvist
8794ec9ad8
Use correct ICU library names when using MinGW cross-compiled "system" ones
2011-05-23 17:33:49 +03:00
Tor Lillqvist
6c28e9e143
Set SOLARLIB also for MinGW (cross-)compilation
...
Set it as on Cygwin, and with the -L flags in the same order as for
Linux &co for consistency.
2011-05-23 17:33:48 +03:00
Tor Lillqvist
62a339916b
Prefix --warn-once with -Wl, as it is a ld flag
2011-05-23 17:33:48 +03:00
Tor Lillqvist
a6f8b386c2
List gnu_getopt here, too
2011-05-23 17:33:48 +03:00
Tor Lillqvist
04a7575ddb
Check COM, not the weird USE_MINGW variable
2011-05-23 17:33:48 +03:00
Tor Lillqvist
25ce4793bb
Use cygpath only when building on Windows
2011-05-23 17:33:48 +03:00
Bjoern Michaelsen
7f99f234e0
make dev-install use smoketest
2011-05-23 11:28:35 +02:00
Robert Nagy
8ce2d816a1
use $GNUMAKE to print the build instructions
2011-05-23 09:24:04 +02:00
Robert Nagy
dde821c26e
fix ant home
2011-05-23 09:23:54 +02:00
Francois Tigeot
62dce7bfca
Temporary fix for a LD_LIBRARY_PATH not propagated issue.
2011-05-22 11:36:09 +02:00
Francois Tigeot
6ec8554c6a
Unify all NetBSD .mk configuration files
2011-05-22 10:35:33 +02:00
Francois Tigeot
6dad9edb9e
Use a single shell source file for all NetBSD platforms
...
Finish cleaning up INPATH and OUTPATH.
2011-05-22 10:29:41 +02:00
Francois Tigeot
255ba80655
Use the same OUTPATH on all NetBSD architectures
2011-05-22 10:04:20 +02:00
Francois Tigeot
3c3aa80261
Do not define PTHREAD_CFLAGS on NetBSD.
2011-05-22 09:26:22 +02:00
Francois Tigeot
95b13c2de1
NetBSD/IA64 has been broken for years, remove it from the build system.
2011-05-22 09:18:46 +02:00
Tor Lillqvist
a804e2c49c
Fix parsing of curl-config --version output
2011-05-22 02:27:01 +03:00
Tor Lillqvist
909d91e041
Use more libraries that MinGW does include
2011-05-22 01:02:27 +03:00
Tor Lillqvist
821d3501ec
Improve system libcurl configury for cross-compilation
2011-05-22 01:01:19 +03:00
Tor Lillqvist
2996bb11bc
Put comments at start of line so they aren't shell comment recipe lines
2011-05-22 00:59:10 +03:00
Tor Lillqvist
2cbda686ee
Drop pointless version printout
2011-05-21 20:18:34 +03:00
Tor Lillqvist
7fa06f6d58
Improve Python detection for cross-compilation
...
Just hardcode known locations of cross-compilation Python packages for
now.
2011-05-21 19:27:16 +03:00
Tor Lillqvist
9055a7bd32
Don't automatically avoid a "system" Python on Windows
2011-05-21 17:37:43 +03:00
Robert Nagy
67a6786fd4
use internal libwpd for now
2011-05-21 15:12:57 +02:00
Tor Lillqvist
3f56e8f87c
Java tweaks for cross-compilation
2011-05-21 02:45:18 +03:00
Tor Lillqvist
e5088368da
FULL_DESK has no meaning as far as I know
2011-05-21 00:45:41 +03:00
Tor Lillqvist
08c6706d0e
No need to hardcode SOLAR_JAVA*=TRUE here
2011-05-21 00:41:56 +03:00
Matus Kukan
a64f87add5
replace res/commandimagelist with cmd
2011-05-20 18:09:28 +02:00
Tor Lillqvist
c761ef3d41
Export NSIS_PATH also in the MinGW cross-compiling case
...
Actually NSIS_PATH is crack, it is actually the *directory* where the
makensis program is located, so why not simply just have a variable
with the full pathname to that instead (or just the command name, in
case it is in the default PATH anyway, like on openSUSE with
/usr/bin/makensis)? That would simplify the stuff in download.pm, too.
2011-05-19 22:55:17 +03:00
Andras Timar
59c7fa441f
use short paths, because '(x86)' in the path causes problem
2011-05-19 19:51:56 +02:00
Tor Lillqvist
b583ee234a
Fix search for NSIS
2011-05-19 19:21:07 +03:00
Radek Doulik
220b01f5a4
get rid of limitting max jobs to 10 for icecream
...
- tested locally that dmake is able to run with -P14 and that
icecream is then using more slots (checked with icemon)
2011-05-19 12:43:23 +02:00
Robert Nagy
333fb1d408
handle amd64 and x86_64 for OpenBSD the same way
2011-05-19 12:26:44 +02:00
Joseph Powers
dcf5401440
On MacOS X, our application is called "LibreOffice.app" and not "OpenOffice.org.app"
2011-05-18 19:05:52 -07:00
Tor Lillqvist
f0469a72d3
Add the wntgcc directories
2011-05-19 00:40:35 +03:00
Niko Rönkkö
9f5de9cb4f
Add config.guess to .gitignore
...
Added pattern '/config.guess' to gitignore file.
2011-05-18 20:48:54 +01:00
Tor Lillqvist
a5436c9794
Add libvisio
2011-05-18 22:48:44 +03:00
Tor Lillqvist
bb7bdda138
Use $(AR) instead of hardcoded ar
2011-05-18 22:48:44 +03:00
