Andras Timar
e3861932fb
remove unnecessary \r characters from en-US message
2011-04-19 15:02:01 +02:00
Petr Mladek
51c05e1cf9
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
...
Conflicts:
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
2011-04-05 17:48:49 +02:00
Petr Mladek
586fc09447
bump product version to 3.3.2rc2, release number to 202
2011-04-05 16:52:52 +02:00
Andras Timar
e5858fef19
fix language codes: be-BY -> be, ns -> nso
2011-03-25 13:19:18 +01:00
Petr Mladek
d9aaf20177
set build depencencies against the new "translations" module
2011-03-25 12:13:50 +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
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
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
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
Petr Mladek
38319486b7
do not create OxygeOffice rpms for LibreOffice build
...
there was a cut&paste problem in the previous commit
2011-03-08 13:56:55 +01:00
Kalman Szalai - KAMI
642b89e8fe
Introduce OxygenOffice as a product
2011-03-07 15:58:27 +01:00
Ivo Hinkelmann
47f8c3989c
CWS-TOOLING: integrate CWS native364
2011-03-07 13:18:13 +01:00
Petr Mladek
03bbe19545
bump product version to 3.3.2rc1, release number to 201
2011-03-07 12:12:18 +01:00
Ivo Hinkelmann
b09657659f
masterfix DEV300: #i10000# usage of L10N build_type
2011-02-22 19:07:34 +01:00
David Tardon
05bbd6da1b
I fixed this properly in libs-core/scripting
...
This reverts commit ba1da290bd44677bdf3576e6b3fcd02a102ed667.
2011-02-19 07:58:00 +01:00
Jan Holesovsky
72d2efe468
Fix build of master without Python scripting.
2011-02-18 22:08:06 +01:00
Petr Mladek
dd5425aee2
bump product version to 3.3.1rc2, release number to 8
...
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-02-17 13:26:31 +01:00
Petr Mladek
c76c6abb5a
bump product version to 3.3.1rc1, widnows build version to 6
...
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-02-17 13:25:54 +01:00
Ingo Schmidt
2dec01266c
native364: #i116893# new ure version
2011-02-14 12:39:32 +01:00
Fridrich Štrba
d1ef65fb85
multilingual sdk build targets
2011-02-14 12:32:53 +01:00
Fridrich Štrba
0fcccba0b8
multilingual sdk build targets
2011-02-14 12:30:07 +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
Ingo Schmidt
68bcc92af3
native359: #i116797# improve msi database
2011-02-04 18:04:46 +01:00
Petr Mladek
22f9e8fa30
bump SHORT_PRODUCTEXTENSION to rc4 and widnows build version to 6
...
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-02-02 10:05:03 +01:00
Andras Timar
72c10177d8
padded nologobanner.bmp, new size is 102x58 - fdo#33372
...
signed off by tml_ on irc
2011-02-01 19:19:34 +01:00
Christian Lohmaier
c4fceb3d0e
Helppacks building not supported on mac, don't attempt to build them.
2011-01-24 18:31:58 +01:00
Petr Mladek
3ecbf2394b
bump SHORT_PRODUCTEXTENSION to rc3 and widnows build version to 5
2011-01-10 17:14:52 +01:00
Christoph Noack
ee9be7cb6a
add de-branded MSI installation artwork, bug#32435
2011-01-10 11:30:34 +00:00
Ingo Schmidt
a9a1bcaf47
native353 #i116309# Optimize include path list
2011-01-06 10:56:36 +01:00
Jan Holesovsky
70896c190c
Merge commit 'libreoffice-3.3.0.2'
...
Conflicts:
configure.in
scp2/source/extensions/directory_extensions.scp
scp2/source/extensions/module_extensions.scp
scp2/source/ooo/file_ooo.scp
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/bin/modules/installer/helppack.pm
solenv/bin/modules/installer/windows/createfolder.pm
solenv/bin/modules/installer/worker.pm
solenv/bin/ooinstall
2010-12-20 01:11:02 +01:00
Petr Mladek
a6d374c6d6
bump SHORT_PRODUCTEXTENSION to rc2 and widnows build version to 4
2010-12-18 15:20:18 +01:00
Petr Mladek
a2698009ac
create rpm/deb/win/mac help pack automatically when enabled
2010-12-17 23:04:16 +01:00
Fridrich Štrba
a15f2430ed
Add a missing file
2010-12-16 11:07:29 +01:00
Fridrich Štrba
19bbf8a463
Add a missing file
2010-12-16 10:12:55 +01:00
Fridrich Štrba
ae76bde6dc
specify the download names for helppacks
2010-12-13 21:27:11 +01:00
Fridrich Štrba
d951585ed0
specify the download names for helppacks
2010-12-13 21:26:14 +01:00
Fridrich Štrba
58411dce90
Create makefile target to package helppacks
2010-12-13 21:08:59 +01:00
Fridrich Štrba
100a61e950
Create makefile target to package helppacks
2010-12-13 21:08:13 +01:00
Christoph Noack
d64943d61f
Slight tweaks of progress bar pos & size
...
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
2010-12-13 18:19:58 +01:00
Andras Timar
5c32afa5af
replaced http://www.openoffice.org - fdo#32169
2010-12-07 22:31:09 +01:00
Petr Mladek
0a86196ccd
bump SHORT_PRODUCTEXTENSION to rc1 and widnows build version to 3
2010-12-01 13:39:08 +01:00
Michael Meeks
9ee0c6f818
add PRODUCTNAME_BR for ulf substitution - now an l10n problem
2010-11-30 15:15:46 +00:00
Michael Meeks
6aec235140
add PRODUCTNAME_BR for ulf substitution - now an l10n problem
2010-11-30 15:12:01 +00:00
Michael Meeks
12fff8caa7
Add BrOffice artwork / branding support
...
Conflicts:
solenv/bin/modules/installer/download.pm
2010-11-30 14:09:09 +00:00
Michael Meeks
c6ed4193c9
Add BrOffice artwork / branding support
2010-11-30 13:58:38 +00:00
Thorsten Behrens
c0ef996da0
Move progress bar (-20,-20) for new artwork
2010-11-30 01:02:00 +01:00
Thorsten Behrens
f419a50ef1
Updated artwork for rc
2010-11-30 00:21:39 +01:00
Mathias Bauer
2e377ca28d
CWS gnumake2: resync to m94
2010-11-26 15:27:38 +01:00