Commit graph

519 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
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
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
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
David Tardon
e3291e927f accept user-supplied CFLAGS/CXXFLAGS 2011-03-21 13:37:01 +01: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
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
Tor Lillqvist
67e10dfb33 Set PATH properly when running cppunittester 2011-03-18 17:35:00 +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
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
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
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
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
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
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
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
Bjoern Michaelsen
590e9c72a6 cppunittester is in bin/cppunit here 2011-03-14 20:10:52 +01:00
Ivo Hinkelmann
4433801923 masterfix DEV300: #i10000# make clean fix 2011-03-14 13:55:57 +01:00
Frank Schoenheit [fs]
647a89f5f5 debuglevels: pulled and merged DEV300.m102 2011-03-14 09:47:56 +01:00
Norbert Thiebaud
91d7800400 use SRCDIR intead of the completely unset LOCDIR 2011-03-12 21:26:42 -06:00
Jan Holesovsky
bd2ec3392a Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +01:00
Ivo Hinkelmann
46696fc052 masterfix DEV300: #i10000# all -> allandcheck 2011-03-11 11:50:00 +01:00
Norbert Thiebaud
589f7ed2b4 Merge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101
* origin/feature/gnumake2.1: (202 commits)
  Revert "starmath need to have _DLL_ defined, even on MacOS"
  tweak library name on MacOS
  starmath need to have _DLL_ defined, even on MacOS
  add helper to set-up the libraries env, to run executable during build
  the startmath module in Module_ooo must use the name of the directory
  add starmath libraries to Repository.mk
  make linkoo scan the solver too, for Norbert's gnumake work
  -Wunitialized is not compatible with -DDEBUG
  rename gb_HIRESTIME to gb_LOWRESTIME. Assume highres precision by default
  add missing library for sc.  Massage the delivered libraries name.
  support USE_GMAKE=1 envvar to build with gmake the modules that can be.
  add sc in the list of gmake-Modules
  support for an alternate gbuild.lst to support gmake build
  add a few comment to balance quotes, to make the editor less confused
  add all the sub-directory of the RESLOCATION to search for resource
  add calc related library to the Repository
  tweak MacOs platform specific include to build on Macos
  fixing variable exports for windows compiler (thanks ause)
  fixing variable exports for windows compiler (thanks ause)
  also accept debug=t
  ...

Conflicts:
	Makefile.in
	Module_ooo.mk
	Repository.mk
	RepositoryFixes.mk
	configure.in
	solenv/bin/build.pl
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/packmodule
	solenv/doc/gbuild/doxygen.cfg
	solenv/doc/gbuild/solenv/gbuild/types.mk
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/BuildDirs.mk
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/Helper.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/Module.mk
	solenv/gbuild/Output.mk
	solenv/gbuild/Package.mk
	solenv/gbuild/PrecompiledHeaders.mk
	solenv/gbuild/SdiTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/processdelivered.awk
	solenv/gbuild/processdeps.awk
	solenv/inc/unxgcc.mk
	soltools/mkdepend/def.h
	soltools/mkdepend/include.c
2011-03-08 22:31:15 -06:00
Ivo Hinkelmann
3384575304 masterfix DEV300: #i10000# empty cat fix 2011-03-08 18:38:46 +01:00
Hans-Joachim Lankenau
df2e7546e0 gnumakefixes: #i117254# set gb_CC to gcc 2011-03-07 11:00:59 +01:00
Hans-Joachim Lankenau
5770a33e6b gnumakefixes: #i117005# fix long link lines and inroduce convert_native macro 2011-03-03 16:46:36 +01:00