Commit graph

2890 commits

Author SHA1 Message Date
Fridrich Štrba
818cc0b97f Unix splash only for Unix 2011-03-25 14:48:07 +01:00
Michael Meeks
849f137e67 disable spl_unx distribution for mac 2011-03-25 04:45:37 +00:00
Michael Meeks
46a73dead4 merge size-sal-textenc i#70166 2011-03-24 16:21:48 +00:00
Andras Timar
5fa0eba1c2 remove duplicated Occitan entry 2011-03-23 19:07:22 +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
Michael Meeks
38a29942c3 disable pagein and oosplash.bin compile/install for Mac 2011-03-22 10:06:38 +00:00
Michael Meeks
5c3f86934e use the unix quickstarter un-conditionally. 2011-03-21 21:17:57 +00:00
Caolán McNamara
b8665f1e8d missing 'End', which is why the smoketest failed 2011-03-20 21:28:08 +00: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
Jan Holesovsky
61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	set_soenv.in
2011-03-17 16:06:07 +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
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
Martin Hosken
fb298513ba graphite statically linked if non system, move ICU to go-oo 2011-03-10 22:36:32 +07:00
Martin Hosken
e87464af6a graphite2 consolidated patch 2011-03-10 22:36:32 +07: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
47f8c3989c CWS-TOOLING: integrate CWS native364 2011-03-07 13:18:13 +01:00
Caolán McNamara
03271a21b9 those were the wrong defines 2011-03-01 21:08:30 +00:00
Andras Timar
fc19bad5b7 l10n: add Breton spelling dictionary 2011-02-22 18:59:27 +01:00
Francois Tigeot
ab50df50a8 Add DragonFly defines. 2011-02-21 14:37:59 +01:00
Tor Lillqvist
d8f97bd4c9 Exclude java_uno_accessbridge.jar and .dll if no SOLAR_JAVA 2011-02-18 11:42:15 +02:00
David Tardon
657710a76d configure inclusion/exclusion of scripting providers 2011-02-18 09:47:50 +01:00
David Tardon
399a30d20e fix defs for scripting provider extensions 2011-02-17 16:21:35 +01:00
Ingo Schmidt
b7a6c674bd native364: #i116865# removing update script 2011-02-14 12:40:33 +01:00
sb
54a05a00d7 sb138: merged in re/DEV300_next towards DEV300_m100 2011-02-11 11:00:41 +01:00
Fridrich Štrba
fca25e4c4c Trying to remove the stlport mention from the code 2011-02-09 20:18:11 +01:00
Jan Holesovsky
d856c71a7d Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
	configure.in
	solenv/bin/build.pl
2011-02-08 00:31:41 +01:00
Jesús Corrius
4fe56df1d5 Revert: Use different Windows registry keys than OOo 2011-02-03 18:25:04 +01:00
Jesús Corrius
9e7da97053 Revert: Change registry prefix values loffice, libreoffice -> LibreOffice 2011-02-03 18:22:41 +01:00
Peter Jentsch
8f54c729d0 Removed obsolete flat xml export xslt scripts from packaging 2011-02-03 17:54:58 +01:00
Jesús Corrius
851641916d fdo#33785: install mtfrenderer.uno.dll in the correct directory 2011-02-03 17:39:20 +01:00
Mathias Bauer
5931f39f4f CWS gnumake3: resync to m99 2011-02-03 15:53:56 +01:00
Mathias Bauer
355c0e61ee CWS gnumake3: convert line ends 2011-02-03 15:40:30 +01:00
Andras Timar
07be07c6e6 added Occitan dict pack to scp2 2011-02-01 13:01:07 +01:00
Andras Timar
84c28e1e4b updated description of Russian dict pack in scp2 2011-02-01 13:00:27 +01:00
Andras Timar
aa4e93c532 added Ukrainian dict pack to scp2 2011-02-01 12:56:41 +01:00
Vladimir Glazunov
d713562535 CWS-TOOLING: integrate CWS dba34b 2011-02-01 11:12:15 +01:00
Jesús Corrius
8d439b06de Change registry prefix values loffice, libreoffice -> LibreOffice 2011-01-30 00:27:29 +01:00
Andras Timar
bfd6b1db7b updated description of Russian dict pack in scp2 2011-01-29 13:17:01 +01:00
Andras Timar
5fd6899a65 added Ukrainian dict pack to scp2 2011-01-29 13:15:53 +01:00
Andras Timar
a16e828ad2 added Occitan dict pack to scp2 2011-01-29 13:09:52 +01:00
Mathias Bauer
166738d8ac CWS gnumake3: kill ENABLE_VBA 2011-01-28 13:59:35 +01:00
Hans-Joachim Lankenau
db66b65ad8 gnumake3: remove comphelper version; fix including extract.hxx 2011-01-28 12:49:53 +01:00
Vladimir Glazunov
488c44cd6b CWS-TOOLING: integrate CWS tl84 2011-01-27 16:53:34 +01:00
Mathias Bauer
cd2532a05a CWS gnumake3: remove gengal 2011-01-27 13:08:03 +01:00