Commit graph

35 commits

Author SHA1 Message Date
Petr Mladek
d9aaf20177 set build depencencies against the new "translations" module 2011-03-25 12:13:50 +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
Ivo Hinkelmann
b09657659f masterfix DEV300: #i10000# usage of L10N build_type 2011-02-22 19:07:34 +01:00
Michael Meeks
35b46d6ee4 ooo_custom_images no longer needs to build 2010-10-11 14:11:45 +01:00
Mathias Bauer
08f512a43f CWS changehid: resync to m89 2010-10-09 18:56:58 +02:00
Philipp Lohmann [pl]
6fa53e8b22 nativeb: #i111098# StartCenter BrOffice images 2010-04-23 14:52:04 +02:00
Christian Lohmaier
9f0bf71f06 cloph14: merge with DEV300_m77 2010-04-23 21:45:49 +02:00
Jens-Heiner Rechtien
3d4e8cd9b1 DEV300 masterfix: #i10000#: create pus subdirectory 2010-04-20 18:28:27 +02:00
Jens-Heiner Rechtien
a652b01cc6 DEV300: masterfix: don't deliver platform dependent files to common output tree 2010-04-16 11:02:15 +02:00
Christian Lohmaier
9cd90e053c cloph14: #i110441# remove obsolete files no longer needed for Aqua version of OOo 2010-03-27 23:45:40 +01:00
Ivo Hinkelmann
87d871bf18 CWS-TOOLING: integrate CWS l10ncleanup04
2009-05-28 13:46:54 +0200 ihi  r272407 : remove forgotten sdf's
2009-05-25 22:32:35 +0200 ihi  r272273 : no WITH_LANG fix
2009-05-25 20:45:58 +0200 ihi  r272272 : remove some comments
2009-05-25 19:55:21 +0200 ihi  r272271 : svx dialog -> cui l10n move
2009-05-25 18:30:58 +0200 ihi  r272268 : build fix
2009-05-18 16:32:02 +0200 ihi  r272033 : bash fix
2009-05-18 16:31:32 +0200 ihi  r272032 : bash fix
2009-05-14 16:23:39 +0200 ihi  r271901 : #i79750# Translation moved to l10n module
2009-05-11 23:36:05 +0200 ihi  r271793 : #i79750# Translation moved into own module
2009-06-17 13:15:46 +00:00
Hans-Joachim Lankenau
68b1055e55 CWS-TOOLING: integrate CWS gh16
2009-03-24 11:26:56 +0100 gh  r269930 : #i100151#
2009-03-24 11:26:18 +0100 gh  r269928 : #i100151#fix a renaming issue
2009-03-20 12:31:00 +0100 gh  r269795 : #i100356# some fixes required
2009-03-19 17:20:02 +0100 gh  r269760 : #i100151# generate UserFeedback names
2009-03-19 17:17:49 +0100 gh  r269759 : #i100151# deliver *.win files
2009-03-19 17:15:10 +0100 gh  r269758 : #i100151# generate UserFeedback names and deliver them
2009-03-19 11:38:53 +0100 gh  r269737 : #i100356# write logs to stdout. enable with switch -printlog
2009-03-12 14:15:48 +0100 gh  r269408 : #i98580# build failed when debug enabled
2009-03-12 13:55:50 +0100 gh  r269404 : #i61192#fix lineendings in hid.lst
2009-03-24 14:11:39 +00:00
Kurt Zenker
8d52d22ffa INTEGRATION: CWS iconunify_DEV300 (1.19.160); FILE MERGED
2008/02/25 09:49:33 hjs 1.19.160.1: #i86362# extract icon theme packing to own module
2008-03-06 15:03:12 +00:00
Vladimir Glazounov
d8108d0659 INTEGRATION: CWS updatefeed3 (1.5.282); FILE MERGED
2007/02/27 12:01:10 obr 1.5.282.1: #i74775# generate update information file as needed for online update
2007-03-01 14:58:29 +00:00
Vladimir Glazounov
1e5687a3cb INTEGRATION: CWS macosxversioning01 (1.18.258); FILE MERGED
2007/01/07 11:40:40 mox 1.18.258.3: Fix mistake in build tags: con --> oon
2007/01/04 13:27:35 mox 1.18.258.2: Fix a compilation error.
2006/12/29 22:07:20 mox 1.18.258.1: Issue number:  #72835#
Insert the files moved from desktop module to here, instsetoo_native.
Create and adjust makefiles accordingly.
Put the files that need versioning in a separate folder, this makes it
possible to handle installer stuff (that also needs versioning) in the
instsetoo_native/macosx/ -folder.
2007-02-26 13:57:25 +00:00
Rüdiger Timm
25a599a45d INTEGRATION: CWS rt11 (1.4.56); FILE MERGED
2005/06/15 12:21:58 rt 1.4.56.2: #i50763# There is no ..\util\hid.lst, so do not try to deliver it.
2005/06/15 12:20:33 rt 1.4.56.1: #i50763# No need to deliver
2005-06-21 08:44:26 +00:00
Rüdiger Timm
0e3b27cb7f #i10000# Dependency on module 'ure' belongs into postprocess/prj/build.lst 2005-06-20 06:27:29 +00:00
Oliver Bolte
a03d238678 INTEGRATION: CWS sb31 (1.16.14); FILE MERGED
2005/05/26 09:20:35 sb 1.16.14.1: #121392# Added ure module.
2005-06-17 08:32:20 +00:00
Vladimir Glazounov
1d3915e742 INTEGRATION: CWS sysui05 (1.15.36); FILE MERGED
2005/02/28 12:54:38 obr 1.15.36.1: #120027# don't use external packages in >>requires<<
2005-03-08 14:43:02 +00:00
Vladimir Glazounov
3cde4fe2c2 INTEGRATION: CWS kendy02 (1.3.80); FILE MERGED
2005/02/21 18:19:03 kendy 1.3.80.1: Issue number: #i43275#
Deliver all images*.zip
2005-02-25 08:48:28 +00:00
Rüdiger Timm
3f94eb8efb #i10000# Hard dependency 2004-12-07 15:00:47 +00:00
Rüdiger Timm
5fa8142ae1 INTEGRATION: CWS rebase (1.11.2); FILE MERGED
2004/11/08 10:35:34 rt 1.11.2.3: #i30601# Module dependencies now moved into new module postprocess
2004/11/05 10:17:05 rt 1.11.2.2: RESYNC: (1.11-1.12); FILE MERGED
2004/10/29 10:36:50 hjs 1.11.2.1: #i34126# change packing of uiconfig.zip
2004-11-16 12:32:01 +00:00
Jens-Heiner Rechtien
a2427abc32 INTEGRATION: CWS beansplit (1.9.8); FILE MERGED
2004/10/12 15:18:05 mi 1.9.8.1: bean project added
2004-11-09 10:28:39 +00:00
Rüdiger Timm
f83a04595a #i10000# remove temporarily needed 'pack' restriction 2004-11-02 08:27:38 +00:00
Kurt Zenker
73ee31d258 #i10000# only build on one computer - temporary workaround 2004-10-08 15:00:58 +00:00
Rüdiger Timm
dc5a29c67c #i10000# Dependency to module xmlsecurity added. 2004-10-06 13:48:06 +00:00
Oliver Bolte
9aaf11a4f6 #i10000# helpcontent removed 2004-09-09 10:16:04 +00:00
Kurt Zenker
a9d9d4d94e INTEGRATION: CWS help2 (1.6.14); FILE MERGED
2004/08/30 14:49:27 hjs 1.6.14.2: #i33583# removed references to old help modules
2004/08/30 14:36:44 gh 1.6.14.1: #i33583# add helpcontent2 to moduledependencies
2004-08-31 07:54:00 +00:00
Rüdiger Timm
8a1bc2ca75 #i33250# Module chaos has been removed. 2004-08-20 11:25:39 +00:00
Rüdiger Timm
b7c818c797 INTEGRATION: CWS instfixer (1.4.6); FILE MERGED
2004/07/08 09:09:57 is 1.4.6.1: #i31173# converting to UTF-8
2004-07-13 08:14:14 +00:00
Oliver Bolte
584ee96ee1 #i10000# create user interface configuration package 2004-07-07 08:07:25 +00:00
Kurt Zenker
6808fdb08a #i10000# sysbols must be unique 2004-06-17 13:12:33 +00:00
Ingo Schmidt
22d53c4cc5 #i25326# adding images.zip
Issue number:
Submitted by:
Reviewed by:
2004-06-04 11:20:21 +00:00
Ingo Schmidt
ce46abd9ed #i25326# setup_native into dependency list 2004-05-27 06:54:51 +00:00
Ingo Schmidt
cf96b373ad #i28464# ooo native installer 2004-05-24 17:10:47 +00:00