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 |
|
Frank Schoenheit [fs]
|
c39367da2e
|
undoapi: merge after pulling CWS sb135
|
2011-01-06 10:24:25 +01:00 |
|
sb
|
71ad34cea8
|
sb135: #i116159# work around i111400 for now; should be reverted when that issue is fixed
|
2010-12-17 15:01:52 +01:00 |
|
Petr Mladek
|
900b1e766f
|
Revert "fix smoketest with the improved download tarball (fdo#30837)"
This reverts commit bdbd0385f6972f49a5e954cebb342263f3666c7d.
It is not longer needed after the previous fix.
|
2010-11-18 20:43:34 +01:00 |
|
Petr Mladek
|
44160aaf7f
|
fix smoketest with the improved download tarball (fdo#30837)
|
2010-11-04 16:02:47 +01:00 |
|
Andras Timar
|
8a3714edf4
|
typo s/Lib0/LibO/
|
2010-10-21 21:22:53 +02:00 |
|
Fridrich Štrba
|
c3de464bcf
|
Fix smoketests
|
2010-10-21 17:45:16 +02:00 |
|
Frank Schoenheit [fs]
|
c872672baf
|
undoapi: introduce javatest_% targets, allowing to run a selected test only
|
2010-10-14 16:40:31 +02:00 |
|
Fridrich Štrba
|
d36cce8266
|
Fix smoketests with new LibreOffice directories
|
2010-10-08 17:34:46 +02:00 |
|
sb
|
ba0e9240c5
|
sb132: merged in DEV300_m89
|
2010-10-04 17:38:17 +02:00 |
|
Noel Power
|
149d18600b
|
fix smoketest
|
2010-09-21 12:53:14 +01:00 |
|
sb
|
c096e86385
|
sb129: #i113189# change UNO components to use passive registration
|
2010-09-10 13:10:07 +02:00 |
|
sb
|
4a99935f1b
|
sb123: merged in late changes of cws/sb120
|
2010-05-20 09:52:28 +02:00 |
|
sb
|
4aee4ee739
|
sb120: #i111558# ... fixed quoting
|
2010-05-20 09:30:53 +02:00 |
|
sb
|
1804fe3368
|
sb123: #i111601# various additional test helper functionality
|
2010-05-14 16:22:06 +02:00 |
|
sb
|
40b3e52f33
|
sb120: #i111558# allow override of tested soffice process
|
2010-05-14 09:46:21 +02:00 |
|
Jens-Heiner Rechtien
|
35170adf00
|
DEV300 masterfix: #i111084#: fix smoketest for setsolar based child workspaces
|
2010-04-22 18:39:29 +02:00 |
|
Jens-Heiner Rechtien
|
a0de0def4a
|
DEV300 masterfix: #i10000#: new naming scheme for installation sets
|
2010-04-21 18:35:51 +02:00 |
|
Ruediger Timm
|
41d1364fb6
|
DEV300 masterfix: #i10000#: Some fixes for the new smoketest: solenv/inc/installationtest.mk used wrong variables (UPDMINOR is not set on RE master builds, use LAST_MINOR from minor.mk instead), smoketestoo_native/makefile.mk needed adaptions to new install set naming scheme.
|
2010-04-21 09:58:45 +02:00 |
|
sb
|
3981a4a991
|
sb118: more typos
|
2010-02-23 16:18:19 +01:00 |
|
sb
|
467375a65a
|
sb118: typo
|
2010-02-23 16:13:08 +01:00 |
|
sb
|
155d989d01
|
sb118: on non-WNT, use a single solver OOo installation for all tests
|
2010-02-23 13:55:51 +01:00 |
|
sb
|
ee90a96ae7
|
sb118: handle --without-junit gracefully
|
2010-02-16 11:33:16 +01:00 |
|
sb
|
b4bcff765d
|
sb118: introduced JAVAIFLAGS so that Java interpreter matches OOo jnilibs
|
2010-02-12 21:44:58 +01:00 |
|
sb
|
13de8eb0e0
|
sb118: moved test OOo installation stuff to new solenv/inc/installationtest.mk (makefile parts) and new test module (C++ and, new, Java unit test parts); adapted sw/qa/unoapi to new (Java) test framework
|
2010-02-12 17:36:13 +01:00 |
|