Commit graph

14443 commits

Author SHA1 Message Date
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
Ivo Hinkelmann
d47730a56b masterfix DEV300: #i10000# always add gb_deliver.log to zip 2011-03-14 16:01:46 +01:00
Fridrich Štrba
66f1625c2f MSVC build creates icudt.lib 2011-03-14 14:42:25 +01:00
Ivo Hinkelmann
4433801923 masterfix DEV300: #i10000# make clean fix 2011-03-14 13:55:57 +01:00
Tor Lillqvist
8d5bd747ed Prefer .NET 4, do not bother with .NET 2 2011-03-14 13:03:33 +02:00
Tor Lillqvist
798ae0d6a6 Let's try preferring MSVS2010/MSVC2010 2011-03-14 11:38:22 +02: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
Norbert Thiebaud
a2f3a5ef76 mis-merge: issue with stl. this may no be the right resolution 2011-03-12 18:49:52 -06:00
Norbert Thiebaud
dcbb52f15a mismerge: l10n has not changed location in libo 2011-03-12 18:49:14 -06:00
Norbert Thiebaud
03db38c4d1 mis-merge: no more vos3 2011-03-12 18:48:33 -06:00
Miklos Vajna
2a1d78c0b2 g: remove leftover debug echo 2011-03-12 23:25:27 +01:00
Andras Timar
68a38407f5 remove legacy SOURCE_ROOT_DIR variable 2011-03-12 09:29:25 +01: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
Fridrich Štrba
69c9005e8c Revert "A lame fix for the rebuilding of external libraries"
This reverts commit f9bfd5e53bf4b962b8a8d15255edb1cd35660e88.
2011-03-10 21:02:55 +01:00
Martin Hosken
450621f6cc remove cmake dependency from graphite 2011-03-10 23:07:20 +07:00
Martin Hosken
4140a3a324 graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
f4a5286839 graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Martin Hosken
ecf0432588 graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
84e65e2613 graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Fridrich Štrba
ce6ad9d908 A lame fix for the rebuilding of external libraries 2011-03-10 22:36:32 +07:00
Martin Hosken
fb298513ba graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
5381fab157 only one icu 2011-03-10 22:36:32 +07:00
Martin Hosken
2d3e6d5ab3 Tidy up for graphite2, removing silgraphite 2011-03-10 22:36:32 +07:00
Martin Hosken
e87464af6a graphite2 consolidated patch 2011-03-10 22:36:32 +07:00
Caolán McNamara
cd57e5bb1d increase number of callstacks recorded 2011-03-10 12:02:10 +00:00
Ivo Hinkelmann
b7f2542845 masterfix DEV300: #i10000# fixed configure 2011-03-10 12:25:12 +01:00
Ivo Hinkelmann
ab76fab508 masterfix DEV300: #i10000# new configure 2011-03-09 16:11:38 +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
Ivo Hinkelmann
3384575304 masterfix DEV300: #i10000# empty cat fix 2011-03-08 18:38:46 +01:00
Release Engineering
b55267fbbe DEV300 2011-03-08 18:13:34 +01:00