David Tardon
598300a489
use system cppunit if configured so
2011-03-19 11:52:49 +01:00
Thorsten Behrens
043f07134e
Remove removed datacarrier from makefile
2011-03-18 17:35:01 +01:00
Tor Lillqvist
d4c24925ec
Avoid unnecessary PATH manipulation for exes located in OUTDIR/bin
...
svidl.exe, transex3.exe and xsltproc.exe are themselves in
${OUTDIR}/bin, so no need to add that directory to PATH when running
them. They will find the DLLs they need from there automatically
anyway.
Besides, the PATH manipulation was wrong as OUTDIR here is a Win32
pathname, starting with a drive letter and colon, while PATH is the
Cygwin one that contains Cygwin pathnames with no drive letters and
with colon as the search path separator. Thus a cygpath -u
transformation of OUTDIR would have been needed to actually make it do
what was intended.
2011-03-18 17:35:01 +01:00
Thorsten Behrens
f5d9c8570d
Remove undefined DataCarrier entries from scp2
...
Michael's fixes turned those into build breaker
2011-03-18 17:35:01 +01:00
Michael Meeks
b846e8e650
fix scp2 errors, re-factor, accelerate, and add error detection to parser
2011-03-18 17:35:01 +01:00
Thorsten Behrens
bce1f07cac
Fix ppt and wpg import
...
There's no STD_UNO_LIB_FILE_PATCH anymore
2011-03-18 17:35:00 +01:00
Tor Lillqvist
67e10dfb33
Set PATH properly when running cppunittester
2011-03-18 17:35:00 +01:00
Jan Holesovsky
a8bf8b9fc0
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
2011-03-18 16:03:09 +01:00
Caolán McNamara
b07ac2bfbf
output actual error message on failure
2011-03-18 10:50:21 +00:00
obo
e3511dc343
masterfix DEV300: #i10000# fix for LAN"
2011-03-18 07:22:29 +01:00
Luboš Luňák
1cb1323220
fix qt3/kde3 library finding
...
Partial revert of b490b1d298960d74be36f9a2c201c702b00bc2b4.
The linker uses only .so files, not .so.<something>.
2011-03-17 16:08:32 +01:00
Jan Holesovsky
61a4bf5a07
Merge remote-tracking branch 'origin/integration/dev300_m101'
...
Conflicts:
set_soenv.in
2011-03-17 16:06:07 +01:00
Michael Meeks
064a0b4957
add helper to set-up the libraries env, to run executable during build
...
Conflicts:
solenv/gbuild/Helper.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/windows.mk
2011-03-17 13:54:51 +00:00
Tor Lillqvist
494a877bf4
Sprinkle some realpath goodness here, too
2011-03-17 15:00:03 +02:00
Bjoern Michaelsen
35701ddafd
killing off stl in gbuild
2011-03-17 13:42:24 +01:00
Tor Lillqvist
8dc2c3e75e
No stlport used any more on Windows
2011-03-17 14:23:37 +02:00
Tor Lillqvist
726b8cbe0f
Add realpath calls
...
This avoids passing pathnames containing symlinks to non-Cygwin
programs. Calling realpath here hopefully means that we don't need to
explicitly expand the pathnames for the src files listed in the
*/AllLangResTarget_*.mk files.
2011-03-17 12:09:00 +02:00
obo
5bda0f9a16
masterfix DEV300: #i10000# create misc/x64 directory missing
2011-03-17 08:28:45 +01:00
Tor Lillqvist
dffa25b902
The WIN_FOO dance no longer needed
2011-03-16 19:59:10 +02:00
Tor Lillqvist
b82df31c50
The WIN_BOOL dance no longer needed and in fact causes compilation errors
2011-03-16 17:30:49 +02:00
Tor Lillqvist
37022d25d2
Revert "Revert "Xsltproc is a non-Cygwin program on Windows so use realpath""
...
This reverts commit 19bd92e4348b500c98b0da4230bfaf7d838133ab.
2011-03-16 15:52:18 +02:00
Tor Lillqvist
f61e488216
Revert "Revert "Sprinkle more realpath calls""
...
This reverts commit a6b8a0d1e59abc52fa54ea2741837b7cde9c1731.
2011-03-16 15:52:16 +02:00
Tor Lillqvist
0878f8d0aa
Revert "Revert "Use realpath on the filename being compiled to expand Cygwin symlinks""
...
This reverts commit b4260a9b516241dd42d992cc148235e153a66d18.
2011-03-16 15:52:08 +02:00
Release Engineering
5bc52fffb7
DEV300
2011-03-16 13:12:46 +01:00
Tor Lillqvist
1acf460987
Revert "Use realpath on the filename being compiled to expand Cygwin symlinks"
...
This reverts commit 4c745207efbbd16e788a416b711703f0298a1ab3.
2011-03-16 13:37:02 +02:00
Tor Lillqvist
13c48a07ab
Revert "Sprinkle more realpath calls"
...
This reverts commit dc803980f04acba6bd0d4a1cdd9a75eb57cd8659.
2011-03-16 13:36:58 +02:00
Tor Lillqvist
cd69565f20
Revert "Xsltproc is a non-Cygwin program on Windows so use realpath"
...
This reverts commit 8593849221aa71dc5781f811b88d0205a718bdd1.
2011-03-16 13:36:52 +02:00
Tor Lillqvist
7fea337445
Xsltproc is a non-Cygwin program on Windows so use realpath
2011-03-16 13:13:33 +02:00
Tor Lillqvist
6bc46f3446
Add msvcprt, too, wherever msvcrt is mentioned
2011-03-16 12:55:07 +02:00
Miklos Vajna
e175056684
Introduce a single .gitattributes file in bootstrap
2011-03-16 11:08:46 +01:00
Tor Lillqvist
9bfd6153d0
Remove unnecessary whitespace on empty line
2011-03-16 11:51:11 +02:00
Tor Lillqvist
c74a923f50
Revert "Fix bogus line continuation and empty line spacing"
...
This reverts commit 66364955f47ce478c32325bafb22283fd47621c8.
2011-03-16 11:49:42 +02:00
Tor Lillqvist
710b25f176
Sprinkle more realpath calls
2011-03-16 11:49:30 +02:00
Tor Lillqvist
361c5b02b7
Fix bogus line continuation and empty line spacing
2011-03-16 11:26:03 +02:00
Tor Lillqvist
57204fffa5
Use realpath on the filename being compiled to expand Cygwin symlinks
2011-03-16 11:24:59 +02:00
obo
ac7a93d1b2
CWS-TOOLING: integrate CWS jl164
2011-03-16 10:11:17 +01:00
obo
22f91c4b17
CWS-TOOLING: integrate CWS l10n36
2011-03-16 09:37:48 +01:00
obo
003b5ee08b
CWS-TOOLING: integrate CWS debuglevels
2011-03-16 08:29:30 +01:00
Kohei Yoshida
af52bcaf41
Define SOLAR_JAVA only when --with-java.
2011-03-15 22:58:42 -04:00
Rene Engelhard
34654ef6e6
make graphite2 check check for >= 0.9.3
2011-03-15 22:54:51 +01:00
Jan Holesovsky
7b44ff3c72
When linking, first specify -o's, then -l's.
...
Some linkers do not find some symbols otherwise.
2011-03-15 19:22:48 +01:00
Michael Meeks
b102e842ce
remove obsolete linkoo piece
2011-03-15 17:09:45 +00:00
Norbert Thiebaud
f716ddb706
add support for symbol=t in gnumake to build release code with symbol
...
It is needed to be able to build the release code with the debug symbol
and without disabling the build optimisations
setting symbol=xxx symbols=xxx SYMBOL=xxxx or SYMBOLS=xxx
where xxx is anything not purely spaces
will activate the generation of symbols
Note that this generation is implicit with debug=t.
2011-03-15 09:03:55 -05:00
Fridrich Štrba
50504eafb2
Downgrade icu to 4.4.2
2011-03-15 10:35:36 +01:00
Tor Lillqvist
53f4ce6039
Revert "Revert "MSVC build creates icudt.lib""
...
This reverts commit 65a266c499def94ff6b169e8e8dade3207c7012a.
2011-03-15 11:33:16 +02:00
Tor Lillqvist
0533d543ac
Revert "Let's try preferring MSVS2010/MSVC2010"
...
This reverts commit 8cd4be6de9889485948e2fea02efbc8d74e55642.
2011-03-15 11:29:52 +02:00
Tor Lillqvist
5e9e4c5484
Revert "Prefer .NET 4, do not bother with .NET 2"
...
This reverts commit ca448fbaf0b18edcfc809fcabcbcac51bb32f3b7.
2011-03-15 11:29:49 +02:00
Tor Lillqvist
0ab41cde01
Revert "MSVC build creates icudt.lib"
...
This reverts commit 15b8ac2a753c8080549f7f0cd23aca485eda3ad0.
2011-03-15 11:29:44 +02:00
Bjoern Michaelsen
590e9c72a6
cppunittester is in bin/cppunit here
2011-03-14 20:10:52 +01:00
Hanno Meyer-Thurow
ff33fd9d5d
Merge Gentoo patches from old build and downstream repositories.
...
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years. Noone cares, therefore rest in peace.
Python2 is going to be ditched at some point. Simply do not fail then.
Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
interesting for Linux Distributions. Enforce the user to place JVMs in one
base directory.
5. Fix build for libxml-2.7.8 with ICU support.
* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
2011-03-14 18:47:10 +01:00