Commit graph

7503 commits

Author SHA1 Message Date
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
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
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
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
Bjoern Michaelsen
590e9c72a6 cppunittester is in bin/cppunit here 2011-03-14 20:10:52 +01:00
Norbert Thiebaud
91d7800400 use SRCDIR intead of the completely unset LOCDIR 2011-03-12 21:26:42 -06:00
Norbert Thiebaud
dcbb52f15a mismerge: l10n has not changed location in libo 2011-03-12 18:49:14 -06:00
Jan Holesovsky
bd2ec3392a Spaces -> tabs in gbuild, GNU make does not like spaces ;-) 2011-03-11 14:30:09 +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
Norbert Thiebaud
f0e5895d5b Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h
2011-03-08 19:43:29 -06:00
Bjoern Michaelsen
7572bcf0b1 solenv/bin/subsequenttests is intended to be executable 2011-03-07 14:55:26 +01:00
Caolán McNamara
6184a626b9 always include these on all platforms to keep things simple 2011-03-06 20:26:55 +00:00
Caolán McNamara
0edc2694ae vos is gone 2011-03-06 15:30:22 +00:00
Fridrich Štrba
0469b1a4e7 Don't regenerate dependencies, just try second time
Since the dependencies generation is broken strategy with external libraries
2011-03-02 16:39:25 +01:00
Fridrich Štrba
25ff71f2c8 Revert "A lame fix for the rebuilding of external libraries"
This reverts commit 42dd24db865ec0112fac4781e63ed11959f02472.
2011-03-02 15:57:26 +01:00
Fridrich Štrba
8ffc225070 A lame fix for the rebuilding of external libraries 2011-03-02 15:40:19 +01:00
Fridrich Štrba
8a86d1d392 Revert "Trying to fix the rebuild of external library after failed build"
This reverts commit 56ffe1d3c7080e9c59f6e66287a433905e80031c.

This one did not have any beneficial effect, only breaking tinderboxes
2011-03-02 13:44:47 +01:00
Bjoern Michaelsen
3402fe5b5f remove commented 4nt support while we are at it 2011-03-02 10:59:54 +01:00
Fridrich Štrba
a38f7a771e Trying to fix the rebuild of external library after failed build 2011-03-02 10:36:35 +01:00
Kalman Szalai - KAMI
3268af2a1a Refine compression of Windows installer
I increased the efficiency of LZM compression of makecab. I found that we can use .Set CompressionMemory=21 setting. This setting produces 83,91% of original installer size and if we combine it with a simple zip compression the download size can reduce to 83,54%.

Reference:
http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg07068.html
2011-03-02 01:25:13 +01:00
Christian Lohmaier
5fc1df0379 fix nested quantifiers in regex 2011-03-01 13:41:25 +01:00
David Tardon
4e4bb296f0 use full path 2011-03-01 08:05:21 +01:00
Jan Darmochwal
b6aa0e8110 Accelerate Perl installer builder
* subs in converter.pl rewritten
* fixed bug in convert_whitespace_stringlist_into_array
* removed copy_array_from_reference (can be written as "$copy = [@{$source}]")
* removed copy_hash_from_reference (can be written as "$copy = {%{$source}}")
* removed convert_stringlist_into_array_without_linebreak_and_quotes
  (equivalent to convert_stringlist_into_array_without_newline)
2011-02-28 17:20:24 +00:00
Ivo Hinkelmann
853a588364 masterfix DEV300: #i10000# remove hard dep 2011-02-22 19:12:18 +01:00
Ivo Hinkelmann
f5c661e67e masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:11:18 +01:00
Ivo Hinkelmann
63bed58e6b masterfix DEV300: #i100000# dep. fix 2011-02-22 15:50:31 +01:00
Caolán McNamara
4dd4885566 revert this 2011-02-22 13:33:30 +00:00
Caolán McNamara
23adf2f0d6 seems we need -s after all 2011-02-22 13:26:45 +00:00
Caolán McNamara
978cc9511e remove javainstaller2 2011-02-22 12:07:32 +00:00
Caolán McNamara
c11ef4be86 -r and -s doesn't do anything 2011-02-22 10:27:15 +00:00
Rene Engelhard
766d3a2b07 move -Wl,--no-relax into extra LINKFLAGS 2011-02-22 00:37:04 +01:00
Caolán McNamara
6ebee61b8d use a different dir for cppunittester 2011-02-21 21:07:03 +00:00
Rene Engelhard
5e87dcbb57 use -Wl,--no-relax (fdo#32224), thanks Michael Cree 2011-02-21 20:59:23 +01:00
Ivo Hinkelmann
06385266df masterfix DEV300: #i10000# removed one hard dep 2011-02-21 16:19:47 +01:00
Francois Tigeot
7c17c577e0 Do not use GNU cp syntax on DragonFly. 2011-02-21 14:37:59 +01:00