Commit graph

78 commits

Author SHA1 Message Date
Rüdiger Timm
50146f350f INTEGRATION: CWS register30 (1.77.4); FILE MERGED
2008/07/31 11:47:03 obr 1.77.4.1: #158122# s/BUILD_SPECIAL/ENABLE_SVCTAGS/g
2008-08-01 08:11:10 +00:00
Oliver Bolte
7201598085 INTEGRATION: CWS aqua11y02 (1.66.60); FILE MERGED
2008/07/11 09:02:52 obr 1.66.60.3: RESYNC: (1.69-1.73); FILE MERGED
2008/06/18 18:04:55 fne 1.66.60.2: RESYNC: (1.66-1.69); FILE MERGED
2008/06/11 13:49:40 obr 1.66.60.1: raised baseline for Java UNO AccessBridge to Java 1.5
2008-07-25 08:12:58 +00:00
Oliver Bolte
d954ed3c35 INTEGRATION: CWS jl108 (1.75.10); FILE MERGED
2008/07/23 11:16:01 jl 1.75.10.2: #i91982# define _MSC for builds with microsoft compiler
2008/07/23 09:16:45 jl 1.75.10.1: #i91982# define MSC for builds with microsoft compiler
2008-07-25 05:35:57 +00:00
Ivo Hinkelmann
7d38fc0ea6 INTEGRATION: CWS native168 (1.69.60); FILE MERGED
2008/07/10 15:10:34 is 1.69.60.1: #158212# avoid same files at different modules
2008-07-17 15:33:49 +00:00
Rüdiger Timm
5a695e215f INTEGRATION: CWS mst01 (1.69.42); FILE MERGED
2008/06/27 11:48:28 mst 1.69.42.1: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}:
  + gid_File_Lib_Xslt:
    use include makefile libxsltversion.mk for soname versioning
2008-07-11 09:32:27 +00:00
Rüdiger Timm
0f8c5ea660 INTEGRATION: CWS ab55 (1.69.50); FILE MERGED
2008/07/02 13:01:46 ab 1.69.50.1: #i91158# System lucene
2008-07-07 15:07:18 +00:00
Rüdiger Timm
97ee7b59b8 #i91319# Conditionalize dictionaries. 2008-07-03 10:39:45 +00:00
Vladimir Glazounov
125289385d INTEGRATION: CWS odfmetadata (1.68.4); FILE MERGED
2008/06/26 11:09:24 mst 1.68.4.3: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}:
  + gid_File_Lib_Raptor, gid_File_Lib_Rasqal, gid_File_Lib_Rdf:
    use include makefile redlandversion.mk for soname versioning
2008/06/25 10:13:36 mst 1.68.4.2: RESYNC: (1.68-1.69); FILE MERGED
2008/06/23 08:51:00 mst 1.68.4.1: #i90956#
- scp2/source/ooo/makefile.mk:
  + add patch from rene: define macro SYSTEM_REDLAND
2008-07-01 15:30:06 +00:00
Vladimir Glazounov
75e43d9d4c INTEGRATION: CWS native160 (1.69.14); FILE MERGED
2008/06/24 10:38:35 is 1.69.14.1: #i88671# merging msvc90 libraries
2008-06-30 14:24:20 +00:00
Rüdiger Timm
45eff72c7c INTEGRATION: CWS sb87 (1.66.16); FILE MERGED
2008/05/13 13:10:27 sb 1.66.16.1: propagate SYSTEM_PYTHON flag
2008-06-09 11:51:56 +00:00
Rüdiger Timm
eaca3eaca3 INTEGRATION: CWS native151 (1.66.36); FILE MERGED
2008/05/06 15:50:11 is 1.66.36.1: #i79800# binfilter into an own package
2008-06-06 08:43:12 +00:00
Vladimir Glazounov
1a885fdfb3 INTEGRATION: CWS rt28 (1.66.58); FILE MERGED
2008/05/27 14:35:14 rt 1.66.58.1: #i89999# portraudio and sndfile have been removed by CWS unifysound01, ENABLE_PASF is obsolete.
2008-06-03 08:18:56 +00:00
Rüdiger Timm
a2303bb57b INTEGRATION: CWS changefileheader (1.65.2); FILE MERGED
2008/03/31 16:07:15 rt 1.65.2.1: #i87441# Change license header to LPGL v3.
2008-04-10 08:41:26 +00:00
Oliver Bolte
d5e8a3aa5d INTEGRATION: CWS obo25 (1.62.58); FILE MERGED
2008/03/20 11:22:06 obo 1.62.58.1: #i87279# remove DISABLE_ADO switch
2008-03-26 11:40:03 +00:00
Rüdiger Timm
08e750a63e #i10000# CWS sb83 changed 'PKGCONFIG' into 'PKG_CONFIG' (in solenv/inc/pkg_config.mk). 2008-03-19 09:25:09 +00:00
Vladimir Glazounov
c085988ef2 INTEGRATION: CWS sb83 (1.58.10); FILE MERGED
2008/02/14 11:05:30 is 1.58.10.6: '#i86068#_readmes_into_brand_language_pack'
2008/02/06 14:08:42 sb 1.58.10.5: #i84200# moved image sets to brand layer
2008/02/01 13:29:00 sb 1.58.10.4: RESYNC: (1.61-1.62); FILE MERGED
2008/01/29 16:00:22 sb 1.58.10.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:27 sb 1.58.10.2: RESYNC: (1.58-1.61); FILE MERGED
2007/12/10 14:52:00 sb 1.58.10.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:30:07 +00:00
Rüdiger Timm
4e7d61a52c INTEGRATION: CWS openssl02 (1.60.12); FILE MERGED
2008/01/08 07:33:52 tkr 1.60.12.1: #i84181# correct Windows packaging issue
2008-01-29 08:55:31 +00:00
Oliver Bolte
7c10f337fa INTEGRATION: CWS native110 (1.57.48); FILE MERGED
2007/11/28 15:14:41 is 1.57.48.2: RESYNC: (1.57-1.58); FILE MERGED
2007/10/04 11:04:56 is 1.57.48.1: #i82251# repackaging, part 3
2008-01-04 16:09:37 +00:00
Kurt Zenker
4c61db6722 INTEGRATION: CWS configure22 (1.58.14); FILE MERGED
2007/12/02 23:21:56 rene 1.58.14.1: #i84181# openssl only needed when neon used
2007-12-12 12:29:25 +00:00
Vladimir Glazounov
60cefbebb2 INTEGRATION: CWS obo20 (1.58.22); FILE MERGED
2007/12/03 14:30:55 obo 1.58.22.1: #i84191# Pack .Net 2005 runtime librarys for Professional Edition only
2007-12-05 15:16:00 +00:00
Rüdiger Timm
633279f6e0 INTEGRATION: CWS execshellmacrogone (1.55.8); FILE MERGED
2007/10/24 08:35:55 rene 1.55.8.2: RESYNC: (1.55-1.57); FILE MERGED
2007/10/24 06:35:43 rene 1.55.8.1: #i79760# krs patches for supressing "Executing shell macro..." output
2007-11-06 14:52:23 +00:00
Rüdiger Timm
73bdc98212 #i80097# correctly conditionalize svp plugin. Patch by pl 2007-07-27 09:32:55 +00:00
Rüdiger Timm
fb58b286f2 INTEGRATION: CWS mergesvp (1.55.50); FILE MERGED
2007/06/27 12:02:31 pl 1.55.50.1: #i78931# libsvp changes
2007-07-24 09:35:13 +00:00
Ivo Hinkelmann
86beae9478 INTEGRATION: CWS aquabundle (1.50.18); FILE MERGED
2007/05/24 20:52:30 obr 1.50.18.1: #i73693# moved office directory structure up in the Mac OS X bundle and renamed program to MacOS
2007-06-05 10:53:45 +00:00
Ivo Hinkelmann
7075d62a15 INTEGRATION: CWS obo12 (1.50.4); FILE MERGED
2007/05/30 12:45:30 obo 1.50.4.2: RESYNC: (1.50-1.51); FILE MERGED
2007/05/23 13:09:47 obo 1.50.4.1: #i76713# Windows Vista PSDK DISABLE_ATL, DISABLE_ADO
2007-06-05 10:03:21 +00:00
Vladimir Glazounov
5226a1e16d INTEGRATION: CWS native91 (1.51.12); FILE MERGED
2007/05/22 14:41:42 is 1.51.12.1: #147874# ENABLE_HEADLESS together with cws headless01
2007-05-25 14:22:49 +00:00
Vladimir Glazounov
cc95e7292f INTEGRATION: CWS headless01 (1.50.10); FILE MERGED
2007/05/08 12:41:15 cmc 1.50.10.1: #i76958# add configure support for unix headless vcl plug
2007-05-25 13:37:27 +00:00
Kurt Zenker
a683db56fe INTEGRATION: CWS libxslt02 (1.47.8); FILE MERGED
2007/04/22 22:04:52 cmc 1.47.8.2: RESYNC: (1.47-1.49); FILE MERGED
2006/12/26 20:33:27 cmc 1.47.8.1: #i30380# integrate libxslt
2007-05-10 12:18:20 +00:00
Rüdiger Timm
401641927f INTEGRATION: CWS npower6 (1.49.24); FILE MERGED
2007/02/07 16:33:27 npower 1.49.24.1: #i74096 support config options to control deployment of vba compatibility api
2007-04-25 15:19:06 +00:00
Vladimir Glazounov
a02c97a614 INTEGRATION: CWS pj70 (1.47.18); FILE MERGED
2007/01/09 11:22:43 pjanik 1.47.18.2: RESYNC: (1.47-1.48); FILE MERGED
2007/01/05 09:07:19 pjanik 1.47.18.1: #i73127#: Add system ICU support.
2007-01-10 10:28:13 +00:00
Jens-Heiner Rechtien
8b2449f470 INTEGRATION: CWS native50 (1.43.44); FILE MERGED
2006/12/12 14:42:16 is 1.43.44.5: RESYNC: (1.44-1.46); FILE MERGED
2006/11/02 12:13:36 is 1.43.44.4: RESYNC: (1.43-1.44); FILE MERGED
2006/08/10 10:34:47 is 1.43.44.3: #i65425# new java installer
2006/06/13 09:54:40 is 1.43.44.2: #i65425# shifting file info from solenv to scp
2006/06/08 08:13:51 is 1.43.44.1: #i65425# xpd file creation for additional languages
2007-01-02 14:29:57 +00:00
Kurt Zenker
0ddd5a682b INTEGRATION: CWS icuupgrade (1.43.66); FILE MERGED
2006/11/14 20:46:20 khong 1.43.66.3: RESYNC: (1.43-1.45); FILE MERGED
2006/11/14 01:04:32 khong 1.43.66.2: #i54479# add patch to support using system ICU
2006/08/07 13:51:10 er 1.43.66.1: #i60645# dependencies on icuversion.mk respectively i18npool/version.mk
2006-12-12 15:17:58 +00:00
Vladimir Glazounov
4a853ac9f3 INTEGRATION: CWS hr33 (1.43.18); FILE MERGED
2006/11/02 19:52:45 hr 1.43.18.2: RESYNC: (1.43-1.44); FILE MERGED
2006/05/03 12:04:23 hr 1.43.18.1: #i63732#: to not install stlport if it's taken from the system
2006-11-22 09:44:58 +00:00
Kurt Zenker
93e71cabad INTEGRATION: CWS gtkquickstart2 (1.43.156); FILE MERGED
2006/10/20 11:07:14 mmeeks 1.43.156.1: Issue number: i#70644#
Submitted by: mmeeks
Disable gtk quick-starter by default.
2006-11-07 14:32:54 +00:00
Oliver Bolte
569c9bc326 INTEGRATION: CWS cmcfixes28 (1.43.172); FILE MERGED
2006/09/27 11:20:28 cmc 1.43.172.1: #i69026# add some optional support for an additional serializer.jar location
2006-10-11 08:29:42 +00:00
Jens-Heiner Rechtien
6770aca5bd INTEGRATION: CWS configure17 (1.40.36); FILE MERGED
2006/04/12 19:49:51 rene 1.40.36.3: RESYNC: (1.40-1.41); FILE MERGED
2006/04/03 16:43:43 rene 1.40.36.2: #i63782# improve ldap configure patch, patch by geki
2006/03/22 13:13:24 rene 1.40.36.1: #i61380# make it possible to disable neon, patch by "geki"
2006-04-20 12:35:04 +00:00
Jens-Heiner Rechtien
b7a532ade3 INTEGRATION: CWS systemjava (1.40.38); FILE MERGED
2006/03/22 15:18:49 cmc 1.40.38.1: #i52974# support using the system java components
2006-04-19 14:15:02 +00:00
Vladimir Glazounov
19a289b5bb INTEGRATION: CWS internatiodel (1.38.56); FILE MERGED
2006/02/10 19:29:32 er 1.38.56.1: #i52115# move LangIDs and ISO conversion from tools to i18npool; introduce class MsLangId and libi18nisolang
2006-04-07 13:42:19 +00:00
Kurt Zenker
df6004340d INTEGRATION: CWS cairocanvas (1.35.76); FILE MERGED
2006/01/27 13:19:45 thb 1.35.76.2: RESYNC: (1.35-1.38); FILE MERGED
2005/11/09 13:00:28 radekdoulik 1.35.76.1: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
scp2 changes to include cairo canvas component in serveces.rdb
2006-02-28 09:48:03 +00:00
Rüdiger Timm
fb7c781d41 INTEGRATION: CWS hro02 (1.38.32); FILE MERGED
2006/02/07 14:16:16 hro 1.38.32.1: #128675# Don't create an error report server entry for non SUN builds as debug information is not available
2006-02-09 16:06:57 +00:00
Rüdiger Timm
08b1fc925b INTEGRATION: CWS configure13 (1.36.6); FILE MERGED
2006/01/02 11:21:19 rene 1.36.6.2: missing .
2006/01/01 23:00:53 rene 1.36.6.1: add missing conbditional in scp2's makefile.mk and make configure set ENABLE_KAB= wince we check for it with != ""
2006-01-10 13:34:23 +00:00
Kurt Zenker
4d54e2d427 INTEGRATION: CWS hunspell (1.35.112); FILE MERGED
2005/11/30 14:54:24 nemeth 1.35.112.1: i58662
2006-01-06 12:15:49 +00:00
Oliver Bolte
f0d12b578b INTEGRATION: CWS nativefixer21 (1.34.2); FILE MERGED
2005/10/05 10:17:01 is 1.34.2.2: RESYNC: (1.34-1.35); FILE MERGED
2005/09/16 11:51:34 is 1.34.2.1: #i54688# Windows CustomActions into scp2
2005-12-21 11:54:26 +00:00
Jens-Heiner Rechtien
a45954f282 INTEGRATION: CWS cmcfixes19 (1.34.10); FILE MERGED
2005/09/23 08:24:19 cmc 1.34.10.1: #i54996# add xalan BUILD_TYPE
2005-09-28 14:47:30 +00:00
Rüdiger Timm
cea215e131 INTEGRATION: CWS ooo19126 (1.33.144); FILE MERGED
2005/09/05 17:49:11 rt 1.33.144.1: #i54170# Change license header: remove SISSL
2005-09-09 00:39:56 +00:00
Rüdiger Timm
ca9aabb7a9 INTEGRATION: CWS nativefixer10 (1.30.58); FILE MERGED
2005/06/13 08:49:04 is 1.30.58.2: RESYNC: (1.30-1.31); FILE MERGED
2005/06/07 12:53:10 is 1.30.58.1: #123407# OOo with JRE
2005-06-17 13:14:51 +00:00
Oliver Bolte
557d236cfc INTEGRATION: CWS moresystemstuff2 (1.30.76); FILE MERGED
2005/06/11 15:38:11 rene 1.30.76.2: RESYNC: (1.30-1.31); FILE MERGED
2005/06/11 15:16:15 rene 1.30.76.1: #i10000# don't try to pack libmyspell.so if we use system-myspell
2005-06-17 08:33:28 +00:00
Jens-Heiner Rechtien
510351fe4f INTEGRATION: CWS evoab202 (1.29.6); FILE MERGED
2005/04/15 21:27:17 mmeeks 1.29.6.1: i#34909#
mmeeks, add evoab2 conditionals.
2005-06-09 13:15:27 +00:00
Jens-Heiner Rechtien
9034a61647 INTEGRATION: CWS systemdb (1.28.2); FILE MERGED
2005/03/31 08:28:26 rene 1.28.2.1: fix build with system db, remove system-db3 flags, add system-db
#i34430# copy db.jar into the tree
2005-04-11 08:33:36 +00:00
Jens-Heiner Rechtien
895778833a INTEGRATION: CWS gcj4 (1.27.2); FILE MERGED
2005/04/04 08:20:10 cmc 1.27.2.1: #i46582# rhino is buildable with gcj 4.0.0 now, so scripting can use it as well, so no ifdef GCJ required in scp2 anymore
2005-04-06 09:54:22 +00:00