Commit graph

50 commits

Author SHA1 Message Date
Tor Lillqvist
457c2602bd Mark setup_native and l10ntools as DESKTOP 2011-06-16 21:47:33 +03:00
Tor Lillqvist
64a5712e6f Drop %_EXT% which was always empty 2011-06-03 13:30:38 +03:00
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
Kalman Szalai - KAMI
95cc1b81f1 Adds OxygenOffice extras as configurable optional
Introduces:
 --enable-extra-gallery  - for additional galleries
 --enable-extra-template - for additional templates
 --enable-extra-sample   - for additional samples
 --enable-extra-font     - for additional fonts
 configure options.
2010-11-30 13:52:46 +01:00
Kalman Szalai - KAMI
957af54659 scp2_build_extensions.diff: Bundle extensions - scp2 part 2010-09-14 15:08:20 +02:00
Ivo Hinkelmann
7d7dabe5cf l10ntools: #i108657# rename transex3 to l10ntools 2010-01-25 17:20:55 +01:00
Mathias Bauer
07ccee5e30 #103496#: missing dependency 2009-09-25 21:07:01 +02: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
Rüdiger Timm
6bc3367515 #i10000# binfilter depends on langtemplates. 2008-07-30 12:38:31 +00:00
Rüdiger Timm
5e0969dfac INTEGRATION: CWS jsc21 (1.8.48); FILE MERGED
2008/07/04 06:43:37 jsc 1.8.48.2: #i88797# rework optional SDK
2008/04/28 09:29:08 jsc 1.8.48.1: #88797# integrate sdk as optional office module
2008-07-11 13:55:04 +00:00
Rüdiger Timm
b061e90ce4 INTEGRATION: CWS mst01 (1.28.50); FILE MERGED
2008/06/27 16:09:46 mst 1.28.50.1: - scp2/prj/build.lst:
  + add dependency on libxslt (for libxsltversion.mk)
2008-07-11 09:45:36 +00:00
Vladimir Glazounov
8203fec607 INTEGRATION: CWS odfmetadata (1.28.4); FILE MERGED
2008/06/27 16:11:16 mst 1.28.4.1: - scp2/prj/build.lst:
  + add dependency on redland (for redlandversion.mk)
2008-07-01 15:29:26 +00:00
Vladimir Glazounov
72200135c7 INTEGRATION: CWS native156 (1.28.28); FILE MERGED
2008/06/19 11:37:06 mba 1.28.28.1: #i90657#: no writingaids.zip anymore
2008-07-01 14:51:44 +00:00
Rüdiger Timm
a02674dafd INTEGRATION: CWS native151 (1.27.62); FILE MERGED
2008/05/06 15:50:10 is 1.27.62.1: #i79800# binfilter into an own package
2008-06-06 08:37:54 +00:00
Vladimir Glazounov
89f0d683db INTEGRATION: CWS sb83 (1.7.54); FILE MERGED
2008/01/29 16:00:17 sb 1.7.54.2: #i85112# merged in cws_src680_native121
2007/12/10 14:54:28 sb 1.7.54.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:24:02 +00:00
Vladimir Glazounov
1b498bea27 INTEGRATION: CWS sb83 (1.24.54); FILE MERGED
2008/03/17 09:01:29 sb 1.24.54.4: RESYNC: (1.25-1.26); FILE MERGED
2008/01/29 16:00:17 sb 1.24.54.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:23 sb 1.24.54.2: RESYNC: (1.24-1.25); FILE MERGED
2007/12/10 14:54:28 sb 1.24.54.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:23:47 +00:00
Kurt Zenker
14dc083e58 INTEGRATION: CWS layout_DEV300 (1.25.36); FILE MERGED
2008/02/12 11:48:34 jcn 1.25.36.1: Initial import of layout-dialogs-config_office-scp2.diff.
2008-03-06 11:46:49 +00:00
Oliver Bolte
04044e4a83 INTEGRATION: CWS native110 (1.24.6); FILE MERGED
2007/11/12 16:05:18 is 1.24.6.1: #i82248# module.pl into source directory
2008-01-04 16:06:26 +00:00
Vladimir Glazounov
86225b369e INTEGRATION: CWS sb71 (1.6.538); FILE MERGED
2007/04/13 14:35:41 sb 1.6.538.1: #i75466# New OOo-wo-URE product.
2007-10-15 11:55:42 +00:00
Vladimir Glazounov
ea93db9655 INTEGRATION: CWS sb71 (1.23.112); FILE MERGED
2007/04/13 14:35:40 sb 1.23.112.1: #i75466# New OOo-wo-URE product.
2007-10-15 11:55:31 +00:00
Kurt Zenker
794c0450bb INTEGRATION: CWS icuupgrade (1.22.46); FILE MERGED
2006/11/14 01:04:31 khong 1.22.46.1: #i54479# add patch to support using system ICU
2006-12-12 15:17:06 +00:00
Ivo Hinkelmann
10d72aee76 INTEGRATION: CWS ause065 (1.21.14); FILE MERGED
2006/08/16 16:41:40 hjs 1.21.14.1: #i68686# missing dependency
2006-08-29 14:09:39 +00:00
Ivo Hinkelmann
af74fa9c80 INTEGRATION: CWS onlineupdate3 (1.20.44); FILE MERGED
2006/07/13 07:24:11 obr 1.20.44.1: #i66949# added online update module
2006-08-04 09:08:19 +00:00
Vladimir Glazounov
31f5274feb INTEGRATION: CWS kdesettings (1.19.218); FILE MERGED
2006/04/11 12:34:30 ebischoff 1.19.218.1: #i63557#
Have OOo use KDE system-wide settings
2006-06-02 11:28:01 +00:00
Rüdiger Timm
63ca1e1524 INTEGRATION: CWS sdkinstaller (1.5.156); FILE MERGED
2005/10/28 13:22:01 is 1.5.156.2: #i56859# java product for all platforms
2005/09/08 10:22:26 is 1.5.156.1: #120096# new sdkoo product
2005-11-09 08:39:07 +00:00
Rüdiger Timm
70d53c400c INTEGRATION: CWS sdkinstaller (1.18.54); FILE MERGED
2005/09/08 10:22:26 is 1.18.54.1: #120096# new sdkoo product
2005-11-09 08:38:56 +00:00
Jens-Heiner Rechtien
68ca4203af #i10000#: add missing dependency 2005-08-05 16:26:02 +00:00
Jens-Heiner Rechtien
8c186dad6c INTEGRATION: CWS pj31 (1.16.78); FILE MERGED
2005/07/15 13:50:22 pjanik 1.16.78.1: #i51755#: ure depends on langmacros
Patch by cmc.
2005-08-05 11:58:31 +00:00
Rüdiger Timm
fe148dc986 #i10000#,#i50767# By making setup_native independent from sfx2 we lost the (implicit) dependency on transex3. 2005-06-23 08:59:44 +00:00
Rüdiger Timm
a520fb2a8f INTEGRATION: CWS optionalbase (1.13.148); FILE MERGED
2005/06/16 07:41:22 fs 1.13.148.1: #i46898# building source/base
2005-06-21 12:31:27 +00:00
Rüdiger Timm
fe4e8019b5 INTEGRATION: CWS nativefixer10 (1.3.110); FILE MERGED
2005/06/07 12:54:39 is 1.3.110.1: #123407# OOo with JRE
2005-06-17 13:14:11 +00:00
Oliver Bolte
e5185cfce5 INTEGRATION: CWS sb31 (1.3.48); FILE MERGED
2005/05/26 09:18:35 sb 1.3.48.4: #121392# Moved URE-specific files to new ure module.
2005/05/11 14:46:02 sb 1.3.48.3: #121935# Added URE README.
2005/04/22 15:09:57 sb 1.3.48.2: #121392# Additional files that are part of a URE installation set.
2005/04/21 13:46:02 sb 1.3.48.1: #121392# Added URE.
2005-06-17 09:17:43 +00:00
Oliver Bolte
c5117e17d1 INTEGRATION: CWS sb31 (1.13.58); FILE MERGED
2005/04/21 13:46:02 sb 1.13.58.1: #121392# Added URE.
2005-06-17 09:17:30 +00:00
Rüdiger Timm
879a55747c #i10000# Do not unnecessarily create directory 'inc/scp' on solver. 2005-03-02 15:53:33 +00:00
Vladimir Glazounov
aed643115a INTEGRATION: CWS nativefixer4 (1.11.20); FILE MERGED
2005/02/11 15:37:40 is 1.11.20.1: #i41333#
2005-02-24 15:27:55 +00:00
Jens-Heiner Rechtien
fe896b79f6 INTEGRATION: CWS buildcond02 (1.8.22); FILE MERGED
2005/01/31 13:23:14 mmeeks 1.8.22.3: RESYNC: (1.9-1.11); FILE MERGED
2005/01/06 17:19:22 mmeeks 1.8.22.2: RESYNC: (1.8-1.9); FILE MERGED
2004/12/09 19:52:41 mmeeks 1.8.22.1: Issue number: #i35742#
Submitted by: mmeeks
Fix python conditional.
2005-02-11 14:52:50 +00:00
Kurt Zenker
0e3a821bd0 INTEGRATION: CWS sysui03 (1.8.34); FILE MERGED
2005/01/13 11:17:14 obr 1.8.34.4: #i39410# moved all UNO component linked against GNOME libraries into separate package
2005/01/13 08:15:06 obr 1.8.34.3: #i36339# modification of /etc/mailcap and /etc/mime.types now done in the desktop integration packages
2005/01/04 09:33:26 obr 1.8.34.2: RESYNC: (1.8-1.9); FILE MERGED
2004/12/14 10:10:34 obr 1.8.34.1: removed obsolete 1.x desktop integration
2005-01-21 11:56:35 +00:00
Kurt Zenker
2c24efe018 INTEGRATION: CWS babelfish (1.1.270); FILE MERGED
2004/12/15 16:12:41 pjanik 1.1.270.1: #i37105#: deliver generated langmacros.inc, remove useless delivery of
MacOS X files.
2005-01-13 18:20:04 +00:00
Kurt Zenker
52fac9dcd0 INTEGRATION: CWS babelfish (1.8.8); FILE MERGED
2004/12/15 16:14:06 pjanik 1.8.8.1: #i37105#: add dependencies on target generating langmacros.inc.
2005-01-13 18:19:53 +00:00
Jens-Heiner Rechtien
584a726cb2 INTEGRATION: CWS ause012 (1.6.10); FILE MERGED
2004/12/02 10:51:46 hjs 1.6.10.2: RESYNC: (1.6-1.8); FILE MERGED
2004/11/24 15:12:20 hjs 1.6.10.1: #i37776# remove obsolete dependency
2004-12-10 17:37:02 +00:00
Oliver Bolte
4e03b88682 INTEGRATION: CWS pythonupgrade (1.5.26); FILE MERGED
2004/11/07 17:08:33 jbu 1.5.26.1: #i32901# python version is now taken from pyversion.mk, so this dependency is now needed (prior, python version was hardcoded in the scp files
2004-11-15 12:15:48 +00:00
Jens-Heiner Rechtien
06324f863c INTEGRATION: CWS sysui02 (1.3.138); FILE MERGED
2004/10/14 07:01:36 obr 1.3.138.1: removed ooo installer cde integration module
2004-11-09 17:47:16 +00:00
Pascal Junck
a5d82539f0 INTEGRATION: CWS pj10 (1.5.16); FILE MERGED
2004/11/03 09:02:07 pjanik 1.5.16.1: #i36548#: Add cp_canvas missing dependency.
2004-11-03 11:36:09 +00:00
Rüdiger Timm
57f2caea41 #i10000# Needs ulfconv binary which gets delivered by module setup_native. 2004-10-25 07:13:06 +00:00
Jens-Heiner Rechtien
42f175d9d0 INTEGRATION: CWS tra2 (1.3.124); FILE MERGED
2004/09/29 08:39:42 tra 1.3.124.1: #i34719#added winexplorerext directory
2004-10-11 13:10:20 +00:00
Kurt Zenker
0485f9c867 INTEGRATION: CWS networker3 (1.2.36); FILE MERGED
2004/05/26 17:00:42 is 1.2.36.1: #i20379# mailcap module
2004-06-11 16:49:17 +00:00
Oliver Bolte
d571166adb #100000# source/canvas added 2004-03-18 14:06:35 +00:00
Ingo Schmidt
687560ff77 #115269# new scp2 project 2004-02-05 17:10:37 +00:00