Commit graph

14296 commits

Author SHA1 Message Date
Fridrich Štrba
f6cc3fd663 Add advapi32 to gd_STDLIBS, since it not linked with by default 2011-03-23 17:35:29 +01:00
Jan Holesovsky
d1862bfe1a Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-03-23 17:13:20 +01:00
Jan Holesovsky
5f08d6e5a4 Merge commit 'ooo/DEV300_m103'
Conflicts:
	configure
	configure.in
	instsetoo_native/util/openoffice.lst
	set_soenv.in
	solenv/bin/cws.pl
	solenv/bin/modules/installer/simplepackage.pm
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/extensions/post_PackModule.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/installationtest.mk
	solenv/inc/minor.mk
	soltools/cpp/_eval.c
2011-03-23 16:58:44 +01:00
Tor Lillqvist
ad6c30fb49 Drop linker switch -DLL, should not be used when linking EXEs 2011-03-23 13:00:05 +02:00
Petr Mladek
4889cd73e7 build fix: find intro.zip when generating installation sets
intro.zip is not longer in the brand subdirectory
2011-03-22 17:58:51 +01:00
Fridrich Štrba
20eced40ba Reverting what should be reverted and leaving what should be left 2011-03-22 15:40:08 +01:00
Fridrich Štrba
0e5ecf3c8b This should not be hurting anybody 2011-03-22 15:02:42 +01:00
Fridrich Štrba
8dbf10024f oops 2011-03-22 14:18:49 +01:00
Fridrich Štrba
56e5671f5d And yet one another windows build environment tweak 2011-03-22 14:16:42 +01:00
Fridrich Štrba
75237f17a6 And yet one more attempt 2011-03-22 13:26:20 +01:00
Fridrich Štrba
0274c596dd Yet another attempt 2011-03-22 13:21:55 +01:00
Fridrich Štrba
90c0043db2 Another attempt at linking on windows 2011-03-22 13:20:22 +01:00
Caolán McNamara
31cb34254f drop -g1 and align gmake gd_SYMBOL from TRUE 2011-03-22 11:26:06 +00:00
Fridrich Štrba
2593439d2b Trying to remove NODEFAULTLIB on Windows 2011-03-22 11:11:20 +01:00
Michael Meeks
38a29942c3 disable pagein and oosplash.bin compile/install for Mac 2011-03-22 10:06:38 +00:00
Francois Tigeot
faae793ae8 Treat DragonFly as Linux.
The new build system has introduced some new operating system
conditionals. Use the same path as Linux on DragonFly for now.
2011-03-21 23:27:06 +01:00
Michael Meeks
5c3f86934e use the unix quickstarter un-conditionally. 2011-03-21 21:17:57 +00:00
Robert Nagy
eba592c680 openbsd build fixes
- check for the correct kde and qt libraries
- rework the gnu cp check logic so that it works with older
versions of fileutils too
2011-03-21 19:22:11 +01:00
Petr Mladek
f1b3403c82 download: update name of more external tarballs
f7925ba8491fe570e5164d2c72791358-libfonts.zip
a06a496d7a43cbdc35e69dbe678efadb-libloader.zip
67b42915c8432abf0a922438f00860a2-libxml.zip
f3e2febd267c8e4b13df00dac211dd6d-flute.zip
79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip
5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
2011-03-21 16:28:47 +01:00
Petr Mladek
86400a85e3 download: update name of librepository.zip in ooo.lst 2011-03-21 16:16:04 +01:00
Petr Mladek
65a68c6c1b download: update name of libbase.zip in ooo.lst 2011-03-21 16:16:04 +01:00
Bjoern Michaelsen
cf1aa83981 enable optional deliver by hardlink with gb_Deliver_HARDLINK 2011-03-21 14:03:57 +01:00
Bjoern Michaelsen
f5ddeaa24b stripping on linking on linux unless SYMBOLS or DEBUG have been requested 2011-03-21 14:03:57 +01:00
Bjoern Michaelsen
955aa61dd0 fixing gb_SYMBOL logic 2011-03-21 14:03:57 +01:00
Fridrich Štrba
8ea688367e Add some distro-configs from build repository 2011-03-21 13:37:30 +01:00
David Tardon
e3291e927f accept user-supplied CFLAGS/CXXFLAGS 2011-03-21 13:37:01 +01:00
Caolán McNamara
b8665f1e8d missing 'End', which is why the smoketest failed 2011-03-20 21:28:08 +00:00
David Tardon
372debc42b make default debug level 1 and use dbglevel if set 2011-03-19 17:13:10 +01:00
David Tardon
6cb2495999 do not build cppunit if not needed
Suggested by Bjoern Michaelsen.
2011-03-19 16:58:49 +01:00
David Tardon
ac257ccd52 second attempt 2011-03-19 14:36:23 +01:00
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