Vladimir Glazounov
ab8f310707
INTEGRATION: CWS macosxdmgapplink (1.61.24); FILE MERGED
...
2006/12/24 00:54:13 smsm1 1.61.24.1: #72008#: inserts line into the makefile so that the symlink is created for going into the base of the final disk image
2007-01-09 14:04:56 +00:00
Jens-Heiner Rechtien
3cd8b94945
INTEGRATION: CWS cloph05 (1.61.22); FILE MERGED
...
2006/12/21 12:35:36 cloph 1.61.22.1: Issue number: #i#72840#
Don't require gnu cp when building on Mac. The default (POSIX) cp works fine as well.
2007-01-03 09:13:53 +00:00
Oliver Bolte
25eacb4534
INTEGRATION: CWS native62 (1.58.28); FILE MERGED
...
2006/09/25 08:50:50 is 1.58.28.1: #i67179# new pkgformats archive and installed
2006-10-13 09:37:05 +00:00
Kurt Zenker
53f0fefe77
INTEGRATION: CWS ause068 (1.59.4); FILE MERGED
...
2006/09/22 17:48:26 hjs 1.59.4.1: #i69536# + no longer required before echo command
2006-10-05 09:29:45 +00:00
Oliver Bolte
3e0ea34d10
INTEGRATION: CWS writerfilter (1.43.8); FILE MERGED
...
2006/08/03 08:48:24 hbrinkm 1.43.8.7: RESYNC: (1.56-1.58); FILE MERGED
2006/07/21 08:20:24 hbrinkm 1.43.8.6: RESYNC: (1.55-1.56); FILE MERGED
2006/04/18 08:32:17 tra 1.43.8.5: RESYNC: (1.53-1.55); FILE MERGED
2006/03/14 13:54:48 tra 1.43.8.4: RESYNC: (1.52-1.53); FILE MERGED
2006/02/20 14:37:11 tra 1.43.8.3: RESYNC: (1.51-1.52); FILE MERGED
2006/01/02 17:24:51 tra 1.43.8.2: RESYNC: (1.43-1.51); FILE MERGED
2005/11/15 12:31:43 sb 1.43.8.1: #i57188# Missing fix for the recent MSITEMPLATEDIR changes (fix by is).
2006-09-15 13:38:43 +00:00
Oliver Bolte
037a848257
INTEGRATION: CWS native54 (1.56.32); FILE MERGED
...
2006/07/11 10:46:26 is 1.56.32.1: #137670# no more download sets in cws
2006-07-13 14:15:45 +00:00
Oliver Bolte
af84fa61dd
INTEGRATION: CWS vq33 (1.56.26); FILE MERGED
...
2006/07/03 18:52:05 vq 1.56.26.1: #i66881# Fix typo in makefile.
Patch by ericb@openoffice.org
2006-07-10 17:59:28 +00:00
Kurt Zenker
0b53f999ba
INTEGRATION: CWS macosx20xfixes02 (1.55.2); FILE MERGED
...
2006/04/03 19:34:31 obr 1.55.2.1: #i63030# enable simple installer for OS X packaging
2006-04-26 19:45:16 +00:00
Oliver Bolte
d291493b0e
INTEGRATION: CWS cairofixes01 (1.52.42); FILE MERGED
...
2006/03/06 09:05:26 thb 1.52.42.2: #i62739# Corrected typo
2006/03/03 11:26:08 thb 1.52.42.1: #i62739# Changed line of products to pack to be sensitive to BUILD_TYPE (at least for the ODK case)
2006-03-22 10:02:24 +00:00
Oliver Bolte
93b8b0ea78
INTEGRATION: CWS pyunofixes2 (1.28.20); FILE MERGED
...
2006/01/07 21:38:02 jbu 1.28.20.2: RESYNC: (1.28-1.51); FILE MERGED
2006/01/07 20:02:06 jbu 1.28.20.1: #i54532# added officehelper.py (provided by Christian Junker)
2006-03-22 09:55:10 +00:00
Rüdiger Timm
1e58604b21
INTEGRATION: CWS ause048 (1.52.28); FILE MERGED
...
2006/02/14 16:38:22 hjs 1.52.28.1: #i59674# remove hack that is no longer required
2006-03-08 12:52:58 +00:00
Kurt Zenker
37fa3af6ec
INTEGRATION: CWS sb44 (1.48.12); FILE MERGED
...
2005/12/12 16:08:33 sb 1.48.12.1: #i59113# Changed URE version from 1.0 to 1.1.
2006-01-03 11:47:32 +00:00
Jens-Heiner Rechtien
e6e1b1d3a4
INTEGRATION: CWS jsc2 (1.48.20); FILE MERGED
...
2005/12/19 12:08:23 jsc 1.48.20.1: #i59480# build only English SDK - sdkoo_en-US
2005-12-28 17:03:17 +00:00
Oliver Bolte
b97c3b72ca
#i59674#,#i10000# workaround to survive registration of KDE addressbook
2005-12-22 11:53:58 +00:00
Oliver Bolte
44786c67b9
INTEGRATION: CWS nativefixer21 (1.42.2); FILE MERGED
...
2005/11/28 10:24:00 is 1.42.2.5: RESYNC: (1.47-1.48); FILE MERGED
2005/11/15 17:18:27 is 1.42.2.4: RESYNC: (1.46-1.47); FILE MERGED
2005/11/10 17:49:07 is 1.42.2.3: RESYNC: (1.43-1.46); FILE MERGED
2005/10/26 09:59:08 is 1.42.2.2: RESYNC: (1.42-1.43); FILE MERGED
2005/10/24 09:21:59 is 1.42.2.1: #i56369# usage of wrong ure idt files
2005-12-21 11:52:58 +00:00
Hans-Joachim Lankenau
cc515817fc
#128063# workaround dmake issue
2005-11-18 15:14:01 +00:00
Rüdiger Timm
83c3c7a41c
INTEGRATION: CWS oooemailmerge (1.40.6); FILE MERGED
...
2005/09/09 13:01:58 cmc 1.40.6.1: #i51638# add python emailmerge backend
2005-11-11 09:39:44 +00:00
Rüdiger Timm
40007f2227
INTEGRATION: CWS sdkinstaller (1.40.4); FILE MERGED
...
2005/10/28 10:53:11 is 1.40.4.6: #i56804# new ooo dev product
2005/10/24 09:29:51 is 1.40.4.5: #124595# using variable for msitemplate include path
2005/10/18 12:52:17 is 1.40.4.4: #124595# new sdkso
2005/10/17 11:02:36 is 1.40.4.3: #124595# dontstrip for sdk
2005/10/14 12:36:31 jsc 1.40.4.2: RESYNC: (1.40-1.42); FILE MERGED
2005/09/08 10:31:03 is 1.40.4.1: #120096# new sdkoo product
2005-11-09 08:46:45 +00:00
Rüdiger Timm
90bac82fb7
INTEGRATION: CWS pj39 (1.43.6); FILE MERGED
...
2005/11/03 19:43:51 pjanik 1.43.6.1: #i57302#: Add $PKGFORMAT to the path of the packages.
2005-11-07 09:32:10 +00:00
Rüdiger Timm
c5c4df8ab9
#i10000# iso8859_1.py has to be treated like cp1251.py (note: iso8859_1.pyc gets created by solaris builds, cp1251.pyc by windows ones).
2005-11-04 08:48:24 +00:00
Oliver Bolte
baaef2f8a2
INTEGRATION: CWS merge20to201v2 (1.42.6); FILE MERGED
...
2005/10/07 14:17:49 hr 1.42.6.1: #i55617: merge OOO680 CWS macosx11
2005-10-13 08:33:47 +00:00
Jens-Heiner Rechtien
ace479eafe
INTEGRATION: CWS merge20to201 (1.41.8); FILE MERGED
...
2005/09/23 09:58:31 hr 1.41.8.1: #i54997#: merge CWS pj33
2005-09-26 12:17:39 +00:00
Rüdiger Timm
6c883e03a2
INTEGRATION: CWS ooo19126 (1.39.6); FILE MERGED
...
2005/09/05 17:30:19 rt 1.39.6.1: #i54170# Change license header: remove SISSL
2005-09-07 17:25:05 +00:00
Rüdiger Timm
785f958931
INTEGRATION: CWS debsize (1.39.2); FILE MERGED
...
2005/08/28 21:04:11 obr 1.39.2.2: #i53823# fixed typo
2005/08/26 11:49:24 hjs 1.39.2.1: #i53823# fix dependencies
2005-08-30 07:52:51 +00:00
Rüdiger Timm
756ea3266e
INTEGRATION: CWS debianer (1.34.12); FILE MERGED
...
2005/08/05 10:22:49 is 1.34.12.7: #i51885# preparing debian packages
2005/08/04 10:44:05 obr 1.34.12.6: fixed PKGFORMAT docu
2005/08/04 08:37:54 is 1.34.12.5: #i51885# creating debian packages
2005/08/03 15:23:17 is 1.34.12.4: #i51885# preparing debian packages
2005/08/03 13:07:28 is 1.34.12.3: #i51885# preparing debian builds
2005/08/03 05:12:01 obr 1.34.12.2: RESYNC: (1.34-1.36); FILE MERGED
2005/07/28 13:01:51 is 1.34.12.1: #i51885# preparing debian builds
2005-08-18 11:49:13 +00:00
Rüdiger Timm
e974a7fb0d
INTEGRATION: CWS nojava3 (1.34.14); FILE MERGED
...
2005/08/09 15:26:07 rene 1.34.14.2: RESYNC: (1.34-1.37); FILE MERGED
2005/07/27 09:40:58 rene 1.34.14.1: #i52512# fix --disable-java builds, patch by maho
2005-08-18 06:24:58 +00:00
Jens-Heiner Rechtien
eb68209bf5
INTEGRATION: CWS ause033 (1.34.4); FILE MERGED
...
2005/07/19 13:59:52 hjs 1.34.4.2: #i51391# remove before copy to deal correctly with symlinks
2005/07/15 16:51:50 hjs 1.34.4.1: #i52031# resorted targets, #i51391# do not preserve links
2005-08-05 13:01:21 +00:00
Jens-Heiner Rechtien
a2a1d6719c
#i10000#: restrict DONT_REMOVE_PACKAGE to Linux
2005-07-29 10:31:20 +00:00
Jens-Heiner Rechtien
44735c350f
#i10000#: set DONT_REMOVE_PACKAGE
2005-07-29 10:28:34 +00:00
Kurt Zenker
54f3801137
INTEGRATION: CWS ause030 (1.28.16); FILE MERGED
...
2005/06/16 10:15:25 hjs 1.28.16.2: #123620# simplify
2005/06/14 10:34:56 hjs 1.28.16.1: #123620# remove obsolete remains of OOo 1.1.x
2005-07-11 14:37:26 +00:00
Hans-Joachim Lankenau
a4ae50fdfc
#i51049# fix win/tcsh build breaker
2005-06-23 14:33:26 +00:00
Rüdiger Timm
f99e2d969f
#i10000# Specify path to openoffice.lst in target 'ure'.
2005-06-20 07:32:40 +00:00
Rüdiger Timm
12109d38bb
INTEGRATION: CWS nativefixer10 (1.28.10); FILE MERGED
...
2005/06/13 16:00:51 is 1.28.10.3: #123407# python files for ooowithjre
2005/06/13 08:48:17 is 1.28.10.2: RESYNC: (1.28-1.29); FILE MERGED
2005/06/07 13:17:06 is 1.28.10.1: #123407# OOo with JRE
2005-06-17 13:10:41 +00:00
Oliver Bolte
5d4b0ac14f
INTEGRATION: CWS sb31 (1.22.6); FILE MERGED
...
2005/06/02 13:19:08 sb 1.22.6.8: RESYNC: (1.24-1.28); FILE MERGED
2005/06/02 09:58:54 sb 1.22.6.7: #121932# Changes for wntmsci10.
2005/05/25 13:28:20 sb 1.22.6.6: #121932# Adaption for wntmsci10; cleanup.
2005/05/12 16:16:29 sb 1.22.6.5: #121935# Added URE README.
2005/05/09 13:02:20 sb 1.22.6.4: #121392# Reuse OOo LICENSE file for URE.
2005/05/09 08:30:36 sb 1.22.6.3: #121392# Renamed URE use of UNO_[JAVA_]COMPONENT_PATH to URE_INTERNAL_LIB|JAVA_DIR.
2005/04/27 12:31:36 sb 1.22.6.2: RESYNC: (1.22-1.24); FILE MERGED
2005/04/21 13:49:55 sb 1.22.6.1: #121392# Added URE; for now, the URE has a hardcoded services.rdb, where component libraries are addressed via .
2005-06-17 08:32:34 +00:00
Jens-Heiner Rechtien
4d120b106f
INTEGRATION: CWS ause031 (1.28.14); FILE MERGED
...
2005/06/08 14:20:11 hjs 1.28.14.1: #i48816# fix got lost
2005-06-09 12:48:02 +00:00
Rüdiger Timm
b920b91da4
#i10000# Fix by pjanik for bug introduced with CWS configure10
2005-05-13 15:11:15 +00:00
Rüdiger Timm
1680a7ab33
INTEGRATION: CWS configure10 (1.24.8); FILE MERGED
...
2005/05/12 15:20:05 rene 1.24.8.1: fix --disable-epm
2005-05-13 11:14:08 +00:00
Oliver Bolte
12c390fbd3
#i10000# dont generate cp1251.pyc file on solver
2005-05-04 13:18:46 +00:00
Oliver Bolte
8e783b95bb
INTEGRATION: CWS ause026 (1.23.4); FILE MERGED
...
2005/04/21 17:33:32 hjs 1.23.4.3: #i38842# installer image for languagepack too
2005/04/14 16:31:57 hjs 1.23.4.2: #i38842# welcome in win-installer
2005/04/13 11:38:16 hjs 1.23.4.1: #i38842# select splash
2005-05-03 14:03:31 +00:00
Oliver Bolte
3f983f9bbc
INTEGRATION: CWS nativefixer6 (1.23.2); FILE MERGED
...
2005/04/08 14:09:58 is 1.23.2.1: #121279# no empty format for windows
2005-04-20 10:39:06 +00:00
Rüdiger Timm
02ceb56b32
INTEGRATION: CWS nativefixer5 (1.21.2); FILE MERGED
...
2005/03/22 16:50:22 is 1.21.2.1: #i20372# preparing Solaris patch
2005-04-04 09:10:29 +00:00
Oliver Bolte
88b19541be
INTEGRATION: CWS vq12 (1.20.12); FILE MERGED
...
2005/03/11 16:09:37 vq 1.20.12.1: #i44720# Fix PYTHONPATH for W32-4nt.
2005-03-18 09:16:29 +00:00
Oliver Bolte
94e77308b6
INTEGRATION: CWS configure7 (1.20.10); FILE MERGED
...
2005/03/14 13:59:46 hjs 1.20.10.3: #i44542# name change; no more fallbak
2005/03/11 16:05:58 rene 1.20.10.2: add forgotten -format
2005/03/10 20:13:22 rene 1.20.10.1: #i44542# implement --with-package-format
2005-03-15 08:47:15 +00:00
Rüdiger Timm
c998b19543
#i10000# If USE_PACKAGER is set we surely want to pack (hack necessary because in HH environment EPM is not set).
2005-02-28 09:20:56 +00:00
Vladimir Glazounov
08d713e6a1
INTEGRATION: CWS kendy02 (1.17.4); FILE MERGED
...
2005/02/21 18:16:34 kendy 1.17.4.1: Issue number: #i42265#
Do not try to use EPM when it is disabled.
2005-02-25 08:48:42 +00:00
Hans-Joachim Lankenau
00d74f6554
#i42947# make win/tcsh build find .py modules
2005-02-18 09:15:05 +00:00
Rüdiger Timm
0d9fedf904
#i10000# Make last change work for unix, too: add SOLARLIBDIR to PYTHONPATH because pyuno.so is needed to register pythonscript.py
2005-02-16 09:44:33 +00:00
Jens-Heiner Rechtien
dcd5196685
#i10000#: copy *.py to (BIN); otherwise we'll end up with *.pyc files on solver during registering pyuno
2005-02-15 17:48:17 +00:00
Hans-Joachim Lankenau
397c24cdd4
#i10000# export PYTHONPATH to get loader registered on windows
2005-02-15 11:30:17 +00:00
Rüdiger Timm
9674da9a76
INTEGRATION: CWS nativefixer3 (1.13.2); FILE MERGED
...
2005/01/11 15:02:07 is 1.13.2.1: #i39950# support for mac osx
2005-01-31 09:38:15 +00:00