Commit graph

10175 commits

Author SHA1 Message Date
Vladimir Glazounov
7d2649a1ef INTEGRATION: CWS odfpfixes01 (1.95.34); FILE MERGED
2008/06/17 17:44:40 is 1.95.34.1: #158103# hiding three layer office
2008-07-01 21:50:48 +00:00
Vladimir Glazounov
fe4537fc2b INTEGRATION: CWS odfpfixes01 (1.111.54); FILE MERGED
2008/06/17 17:44:39 is 1.111.54.1: #158103# hiding three layer office
2008-07-01 21:50:31 +00:00
Vladimir Glazounov
d81602e61f INTEGRATION: CWS odfmetadata (1.28.74); FILE MERGED
2008/06/26 11:09:24 mst 1.28.74.2: - 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/17 08:57:20 mst 1.28.74.1: - scp2/source/ooo/{file_library_ooo.scp,module_hidden_ooo.scp,
    shortcut_ooo.scp}:
  + add external redland libraries:
    gid_File_Lib_Raptor, gid_File_Lib_Rasqal, gid_File_Lib_Rdf
  + add unordf component library: gid_File_Lib_Unordf
2008-07-01 15:30:37 +00:00
Vladimir Glazounov
57fb6ad93d INTEGRATION: CWS odfmetadata (1.98.4); FILE MERGED
2008/06/25 10:13:40 mst 1.98.4.2: RESYNC: (1.98-1.100); FILE MERGED
2008/06/17 08:57:20 mst 1.98.4.1: - scp2/source/ooo/{file_library_ooo.scp,module_hidden_ooo.scp,
    shortcut_ooo.scp}:
  + add external redland libraries:
    gid_File_Lib_Raptor, gid_File_Lib_Rasqal, gid_File_Lib_Rdf
  + add unordf component library: gid_File_Lib_Unordf
2008-07-01 15:30:22 +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
1d021fa800 INTEGRATION: CWS odfmetadata (1.290.4); FILE MERGED
2008/06/26 11:09:23 mst 1.290.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:51 mst 1.290.4.2: RESYNC: (1.290-1.292); FILE MERGED
2008/06/17 08:57:20 mst 1.290.4.1: - scp2/source/ooo/{file_library_ooo.scp,module_hidden_ooo.scp,
    shortcut_ooo.scp}:
  + add external redland libraries:
    gid_File_Lib_Raptor, gid_File_Lib_Rasqal, gid_File_Lib_Rdf
  + add unordf component library: gid_File_Lib_Unordf
2008-07-01 15:29:44 +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
57f4a6feb3 INTEGRATION: CWS odfmetadata (1.189.8); FILE MERGED
2008/06/25 10:10:25 mst 1.189.8.2: RESYNC: (1.189-1.190); FILE MERGED
2008/06/23 09:39:03 mst 1.189.8.1: Issue number: #i90956#
Submitted by: rene
Reviewed by:  mst
- config_office/{configure.in,set_soenv.in}:
  + patch from rene: check for system REDLAND (modified for explicit
      --with-system-redland), and set SYSTEM_REDLAND and REDLAND_LIBS
2008-07-01 15:08:43 +00:00
Vladimir Glazounov
8a89f4b0ed INTEGRATION: CWS odfmetadata (1.270.8); FILE MERGED
2008/06/25 10:10:11 mst 1.270.8.4: RESYNC: (1.270-1.271); FILE MERGED
2008/06/25 09:37:59 mst 1.270.8.3: #i90956#
- config_office/{configure.in,configure}:
  + actually set BUILD_TYPE REDLAND
  + regenerate configure
2008/06/23 11:21:59 mst 1.270.8.2: #i90956#
- config_office/configure.in:
  + add a comment to document previous commit
2008/06/23 09:39:03 mst 1.270.8.1: Issue number: #i90956#
Submitted by: rene
Reviewed by:  mst
- config_office/{configure.in,set_soenv.in}:
  + patch from rene: check for system REDLAND (modified for explicit
      --with-system-redland), and set SYSTEM_REDLAND and REDLAND_LIBS
2008-07-01 15:08:22 +00:00
Vladimir Glazounov
a5824f8d1c INTEGRATION: CWS odfmetadata (1.49.72); FILE MERGED
2008/06/25 09:59:08 mst 1.49.72.3: RESYNC: (1.49-1.51); FILE MERGED
2008/06/17 14:59:08 mst 1.49.72.2: - solenv/inc/unxsol{i,s}4.mk:
  + sort warnings alphabetically
2008/06/17 08:46:45 mst 1.49.72.1: - solenv/inc/unxsol{i,s}4.mk:
  + disable warning: identexpected: Identifier expected instead of "}"
2008-07-01 14:59:48 +00:00
Vladimir Glazounov
e918ee689c INTEGRATION: CWS odfmetadata (1.44.4); FILE MERGED
2008/06/25 09:59:04 mst 1.44.4.3: RESYNC: (1.44-1.46); FILE MERGED
2008/06/17 14:59:08 mst 1.44.4.2: - solenv/inc/unxsol{i,s}4.mk:
  + sort warnings alphabetically
2008/06/17 08:46:44 mst 1.44.4.1: - solenv/inc/unxsol{i,s}4.mk:
  + disable warning: identexpected: Identifier expected instead of "}"
2008-07-01 14:59:32 +00:00
Vladimir Glazounov
19b24abf68 INTEGRATION: CWS odfmetadata (1.88.4); FILE MERGED
2008/06/17 15:36:03 mst 1.88.4.1: - solenv/inc/tg_ext.mk:
  + MACOSX: do not overwrite LDFLAGS; instead, prepend to LDFLAGS
2008-07-01 14:59:15 +00:00
Vladimir Glazounov
a189e99094 INTEGRATION: CWS odfmetadata (1.133.38); FILE MERGED
2008/06/25 09:59:15 mst 1.133.38.2: RESYNC: (1.133-1.134); FILE MERGED
2008/06/17 16:04:44 mst 1.133.38.1: - solenv/inc/libs.mk:
  + fix XSLTLIB: use ZLIB3RDLIB
  + add REDLANDLIB
2008-07-01 14:58:58 +00:00
Vladimir Glazounov
d17427a523 INTEGRATION: CWS odfmetadata (1.28.4); FILE MERGED
2008/06/25 09:58:58 mst 1.28.4.2: RESYNC: (1.28-1.32); FILE MERGED
2008/06/23 09:09:28 mst 1.28.4.1: Issue number: #i90956#
Submitted by: rene
- solenv/config/sdev300.ini:
  + patch from rene: add REDLAND to BUILD_TYPE
2008-07-01 14:58:41 +00:00
Vladimir Glazounov
de2058de2f INTEGRATION: CWS native156 (1.50.20); FILE MERGED
2008/06/19 12:13:30 mba 1.50.20.1: #i90657#: no lingu
2008-07-01 14:53:34 +00:00
Vladimir Glazounov
eb0318c8c8 INTEGRATION: CWS native156 (1.99.16); FILE MERGED
2008/06/19 11:36:59 mba 1.99.16.2: #i90657#: no writingaids.zip anymore
2008/06/18 13:49:17 is 1.99.16.1: #i89121# oxt dictionaries
2008-07-01 14:53:20 +00:00
Vladimir Glazounov
b10898cc8a INTEGRATION: CWS native156 (1.247.20); FILE MERGED
2008/06/18 13:49:16 is 1.247.20.1: #i89121# oxt dictionaries
2008-07-01 14:53:00 +00:00
Vladimir Glazounov
404fb9be94 INTEGRATION: CWS native156 (1.50.44); FILE MERGED
2008/06/19 11:36:59 mba 1.50.44.1: #i90657#: no writingaids.zip anymore
2008-07-01 14:52:39 +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
Vladimir Glazounov
c559d754ff INTEGRATION: CWS native156 (1.80.6); FILE MERGED
2008/06/17 14:44:30 is 1.80.6.2: RESYNC: (1.80-1.83); FILE MERGED
2008/05/30 10:54:10 is 1.80.6.1: #i89121# spellchecker selection process
2008-07-01 14:49:51 +00:00
Vladimir Glazounov
a453c430b9 INTEGRATION: CWS ubuntusoclient (1.7.6); FILE MERGED
2008/06/20 14:47:54 vg 1.7.6.2: #158126# Ubuntu: use local perl
2008/06/12 14:11:53 vg 1.7.6.1: #158126# Ubuntu: use local perl
2008-07-01 14:44:40 +00:00
Vladimir Glazounov
d0cbcbe8f6 INTEGRATION: CWS ubuntusoclient (1.35.16); FILE MERGED
2008/06/20 15:15:56 vg 1.35.16.1: #158126# new platform for Ubuntu builds
2008-07-01 14:43:53 +00:00
Vladimir Glazounov
75f2936afe INTEGRATION: CWS ubuntusoclient (1.84.18); FILE MERGED
2008/06/30 11:14:15 vg 1.84.18.2: #158126# Further reduce number of new variables.
2008/06/26 09:03:39 vg 1.84.18.1: #158126# some additional env resets
2008-07-01 14:42:26 +00:00
Vladimir Glazounov
00612923e4 INTEGRATION: CWS ubuntusoclient (1.29.10); FILE MERGED
2008/06/30 11:14:15 vg 1.29.10.6: #158126# Further reduce number of new variables.
2008/06/26 09:02:55 vg 1.29.10.5: #158126# moved some env resets to ssolar.cmn, removed obsolete variables
2008/06/25 12:55:02 vg 1.29.10.4: #158126# reset additional env vars
2008/06/23 15:34:55 vg 1.29.10.3: #158126#
2008/06/23 12:17:24 vg 1.29.10.2: #158126# faked jdk5 for builds in SO environment
2008/06/20 14:46:13 vg 1.29.10.1: #158126# added new platform for ubuntu builds
2008-07-01 14:42:11 +00:00
Vladimir Glazounov
f39d3b9a3f INTEGRATION: CWS ubuntusoclient (1.49.16); FILE MERGED
2008/06/20 14:42:24 vg 1.49.16.1: #158126# generic linux condition
2008-07-01 14:41:50 +00:00
Vladimir Glazounov
7c849c17df INTEGRATION: CWS native156 (1.2.26); FILE MERGED
2008/06/18 12:51:23 mba 1.2.26.1: #i90657#: create dictionary extensions
2008-07-01 14:14:20 +00:00
Vladimir Glazounov
063bca3e8e INTEGRATION: CWS native156 (1.60.64); FILE MERGED
2008/06/17 14:44:14 is 1.60.64.2: RESYNC: (1.60-1.61); FILE MERGED
2008/05/30 10:55:44 is 1.60.64.1: #i89121# spellchecker selection process
2008-07-01 14:13:37 +00:00
Vladimir Glazounov
739e4b9140 INTEGRATION: CWS native156 (1.47.18); FILE MERGED
2008/05/30 10:55:43 is 1.47.18.1: #i89121# spellchecker selection process
2008-07-01 14:13:11 +00:00
Vladimir Glazounov
78f51fbd99 INTEGRATION: CWS native156 (1.94.18); FILE MERGED
2008/06/17 14:44:10 is 1.94.18.2: RESYNC: (1.94-1.95); FILE MERGED
2008/05/30 10:55:43 is 1.94.18.1: #i89121# spellchecker selection process
2008-07-01 14:12:52 +00:00
Vladimir Glazounov
73ba62de72 INTEGRATION: CWS native156 (1.111.18); FILE MERGED
2008/05/30 10:55:43 is 1.111.18.1: #i89121# spellchecker selection process
2008-07-01 14:12:39 +00:00
Vladimir Glazounov
8c5ddddb9a #i91263# typos... 2008-07-01 13:06:07 +00:00
Hans-Joachim Lankenau
522e1a0519 #i10000# - reset ENABLE_PCH 2008-07-01 07:56:01 +00:00
Vladimir Glazounov
eb6fcd4979 INTEGRATION: CWS native160 (1.50.12); FILE MERGED
2008/06/24 10:38:35 is 1.50.12.1: #i88671# merging msvc90 libraries
2008-06-30 14:25:15 +00:00
Vladimir Glazounov
96cff5c7e5 INTEGRATION: CWS native160 (1.7.16); FILE MERGED
2008/06/24 10:38:35 is 1.7.16.1: #i88671# merging msvc90 libraries
2008-06-30 14:25:02 +00:00
Vladimir Glazounov
8e3c80d9c1 INTEGRATION: CWS native160 (1.99.10); FILE MERGED
2008/06/24 10:38:35 is 1.99.10.1: #i88671# merging msvc90 libraries
2008-06-30 14:24:49 +00:00
Vladimir Glazounov
240d55632a INTEGRATION: CWS native160 (1.3.84); FILE MERGED
2008/06/24 15:04:15 is 1.3.84.2: #i88671# merging msvc90 libraries
2008/06/24 10:38:35 is 1.3.84.1: #i88671# merging msvc90 libraries
2008-06-30 14:24:33 +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
Vladimir Glazounov
ceb3a26e2e INTEGRATION: CWS native160 (1.290.16); FILE MERGED
2008/06/24 10:38:34 is 1.290.16.1: #i88671# merging msvc90 libraries
2008-06-30 14:24:07 +00:00
Vladimir Glazounov
481fed895d INTEGRATION: CWS native160 (1.12.12); FILE MERGED
2008/06/24 10:38:34 is 1.12.12.1: #i88671# merging msvc90 libraries
2008-06-30 14:23:54 +00:00
Vladimir Glazounov
1a0eb5b706 INTEGRATION: CWS native160 (1.3.118); FILE MERGED
2008/06/24 10:41:16 is 1.3.118.1: #i88671# merging msvc90 libraries
2008-06-30 14:23:32 +00:00
Vladimir Glazounov
75be36eb7d INTEGRATION: CWS native160 (1.3.118); FILE MERGED
2008/06/24 10:41:15 is 1.3.118.1: #i88671# merging msvc90 libraries
2008-06-30 14:23:19 +00:00
Vladimir Glazounov
cbbc9e1d3d INTEGRATION: CWS native160 (1.2.118); FILE MERGED
2008/06/24 10:41:15 is 1.2.118.1: #i88671# merging msvc90 libraries
2008-06-30 14:23:07 +00:00
Vladimir Glazounov
d5f95be9d3 INTEGRATION: CWS native160 (1.3.104); FILE MERGED
2008/06/26 10:42:47 is 1.3.104.2: #i91050# merging customactions into execute tables
2008/06/24 10:36:21 is 1.3.104.1: #i88671# merging msvc90 libraries
2008-06-30 14:22:23 +00:00
Vladimir Glazounov
87763b2a24 INTEGRATION: CWS dba30e (1.292.4); FILE MERGED
2008/06/19 10:36:07 oj 1.292.4.1: merge mysql changes in
2008-06-30 14:13:15 +00:00
Vladimir Glazounov
f95bf6752c INTEGRATION: CWS m68kport01 (1.189.2); FILE MERGED
2008/06/11 07:58:04 cmc 1.189.2.1: #i90600# config_office support for m68k
2008-06-30 14:06:07 +00:00
Vladimir Glazounov
73c817621d INTEGRATION: CWS m68kport01 (1.1.2); FILE ADDED
2008/06/11 08:09:34 cmc 1.1.2.1: #i90600#  solenv support for m68k
2008-06-30 14:03:13 +00:00
Vladimir Glazounov
828037cfa7 INTEGRATION: CWS m68kport01 (1.38.76); FILE MERGED
2008/06/11 08:09:34 cmc 1.38.76.1: #i90600#  solenv support for m68k
2008-06-30 14:03:01 +00:00
Kurt Zenker
37cb834220 #i10000# disable PCH for sw 2008-06-30 12:21:09 +00:00
Oliver Bolte
5c11f4e5ee #i10000# fix for bash shell (USE_SHELL) 2008-06-30 08:56:44 +00:00
Kurt Zenker
b236a88d9b #i90853# result as int 2008-06-26 15:53:02 +00:00