Commit graph

84 commits

Author SHA1 Message Date
Jan Holesovsky
ddf1d503c6 Kill copy'n'paste. 2011-09-30 21:34:55 +02:00
Jan Holesovsky
3927d9bd2a Add support for bundling the -system .dll's into the MinGW builds. 2011-09-30 21:11:26 +02:00
Andras Timar
05293cb04c remove checks for unused BUILD_SPECIAL environment variable 2011-09-28 13:48:10 +02:00
Tor Lillqvist
bf3ff35d8c Adapt for MinGW cross-builds
Adapt some of the DLL names to match conventions we currently use in a
MinGW build. If those are changed to be exactly like when built with
MSVC (for SDK ABI stability reasons), will have to change here, too.

Bypass stuff that we can't build with MinGW when necessary. Should be
synchronized with the corresponding makefiles, obviously. We can't
currently build the Explorer extension or MSI installer custom actions
with MinGW due to lack of some required headers and/or import
libraries.
2011-08-30 11:13:34 +03:00
Radek Doulik
f6c0c74912 add mtfrenderer component again 2011-07-27 11:52:58 +02:00
Bjoern Michaelsen
5012e466ce resyncing to master 2011-07-21 18:27:57 +02:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00
Bjoern Michaelsen
182b970b81 gnumake4: adjust scp2 to gbuild 2011-06-22 14:33:53 +02:00
Bjoern Michaelsen
81a1c065fd Merge branch 'master' into feature/gnumake4
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/platform/winmingw.mk
	solenv/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk
2011-06-19 11:36:52 +02:00
Philipp Lohmann [pl]
54c611fa45 ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384] 2011-06-17 13:51:41 +02:00
Jan Holesovsky
d75defa37f Make the online update service configurable (via --enable-online-update).
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-06-17 11:45:12 +02:00
Thorsten Behrens
043f07134e Remove removed datacarrier from makefile 2011-03-18 17:35:01 +01:00
Fridrich Štrba
91cc35dd8a reference the two files in the corresponding makefile.mk 2010-12-16 11:26:04 +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
Luboš Luňák
5609a75f11 build KDE4 backend module also when not building for KDE3 2010-10-06 17:50:58 +02:00
Radek Doulik
5b96fe6b4e emf+-scp2-renderer.diff: emf+ import - make the renderer install 2010-09-15 11:16:13 +02:00
Kalman Szalai - KAMI
8e97855f24 scp2_makefile_extensions.diff: bundle extensions - scp2 changes. 2010-09-14 15:14:57 +02:00
sb
6b9f15d19c sb119: merged in DEV300_m72 2010-02-26 09:55:56 +01:00
Jens-Heiner Rechtien
f281d77a21 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
sb
83ebf203a2 sb119: merged in DEV300_m69 2010-01-18 15:33:58 +01:00
sb
3f06a5712c sb119: #i108102# clened up --enable-crashdump and crashrep/ 2010-01-18 11:59:59 +01:00
Ingo Schmidt
0e1fee4e44 native273 #i106809# exchange mergemodules by redistributables 2009-12-03 17:28:42 +01:00
Oliver Bolte
8893c204bd CWS-TOOLING: integrate CWS transogl03redux
2009-02-09 13:59:40 +0100 thb  r267511 : #i96946# Added seemingly missing change for the color space selection for the slide textures
2009-02-04 10:47:12 +0100 cmc  r267353 : #i96946# integrate ogltrans work
2009-02-19 13:21:10 +00:00
Oliver Bolte
9e7d59cf2f CWS-TOOLING: integrate CWS dv07
2009-02-12 13:22:37 +0100 dv  r267650 : #i94560# Removed string, which needed translation
2009-01-27 16:09:50 +0100 dv  r267004 : #i94560# Allow building without redistributable
2009-01-27 10:56:38 +0100 is  r266965 : #i98509# InstallOrder for extension module
2009-01-26 08:08:16 +0100 dv  r266899 : #i94560# Work around Windows Vista installation problems
2009-01-19 14:28:56 +0100 dv  r266498 : CWS-TOOLING: rebase CWS dv07 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:56:07 +0100 dv  r266477 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:54:30 +0100 dv  r266476 : #i94560# Added custom action to work around 'major upgrade' problem on Windows Vista
2009-01-19 09:13:06 +0100 dv  r266474 : #i94347# Changed LaunchCondition from AdminUser to Privileged
2008-12-18 08:42:04 +0100 dv  r265662 : #i97201# remove old release notes when notified about updates
2008-12-15 14:50:33 +0100 dv  r265501 : #i96844# Use fputs instead of fprintf
2009-02-18 10:41:06 +00:00
Oliver Bolte
e59aa2104b CWS-TOOLING: integrate CWS oooimprovement2
2009-01-28 14:35:33 +0100 b_michaelsen  r267059 : #i98555# fixed help url
2009-01-27 12:47:40 +0100 b_michaelsen  r266982 : #159112# fixed enabling vcl part of usage tracking in an running session
2009-01-27 12:28:58 +0100 b_michaelsen  r266980 : #159129# deiniting eventlogger in vcl if it was inited, not if it was enabled (the logger can be disabled inbetween
2009-01-27 12:22:45 +0100 b_michaelsen  r266978 : whitespace fixes
2009-01-27 10:32:02 +0100 b_michaelsen  r266962 : #i94949# disposing of uploader thread
2009-01-23 17:00:57 +0100 b_michaelsen  r266839 : #159112# enabling/disabling of usage tracking takes effect without restart
2009-01-23 16:58:59 +0100 b_michaelsen  r266837 : #159112# enabling/disabling of usage tracking takes effect without restart
2009-01-23 01:08:49 +0100 b_michaelsen  r266761 : #159081# fixed buildid in oooimprovement
2009-01-22 22:51:16 +0100 b_michaelsen  r266759 : #i90370# including build id
2009-01-22 15:37:05 +0100 b_michaelsen  r266727 : #i90370# fixing precompiled headers for win32
2009-01-22 15:34:05 +0100 b_michaelsen  r266722 : #i90370# initializing startup counter
2009-01-22 15:30:52 +0100 b_michaelsen  r266720 : #i90370# enabling startup counter
2009-01-21 13:52:56 +0100 b_michaelsen  r266666 : #i98143# adjusted smoketest for usage tracking
2009-01-20 18:34:12 +0100 b_michaelsen  r266617 : #i90370#
2009-01-20 15:08:45 +0100 is  r266587 : #i90370# new improvement feature
2009-01-20 14:42:39 +0100 b_michaelsen  r266583 : #i90370# changing delivered job registration location
2009-01-20 12:35:31 +0100 is  r266567 : #i90370# new improvement feature
2009-01-20 12:33:51 +0100 is  r266566 : #i90370# new improvement feature
2009-01-20 12:33:20 +0100 is  r266565 : #i90370# new improvement feature
2009-01-20 11:47:13 +0100 b_michaelsen  r266559 : #i90370# updating Usage Tracking Info Url
2009-01-20 11:28:37 +0100 b_michaelsen  r266558 : #i90370# packing Usage Tracking config schema (xcs)
2009-01-20 11:19:00 +0100 b_michaelsen  r266557 : #i90370# adding Usage Tracking config schema (xcs)
2009-01-19 18:16:34 +0100 b_michaelsen  r266518 : #i90370# adding job registration (xcu)
2009-01-19 17:26:02 +0100 b_michaelsen  r266513 : #i90370# adding liboooimprovement
2009-02-13 11:55:44 +00:00
Release Engineers
585bbb3d4b #i10000# forgotten changes from the socs21 CWS 2008-12-02 11:09:29 +00:00
Rüdiger Timm
a799caa7d1 INTEGRATION: CWS sb95_DEV300 (1.56.68); FILE MERGED
2008/09/01 09:21:56 sb 1.56.68.1: #i92798# missing cleanup from previous attempt at fixing this issue
2008-09-04 05:56:06 +00:00
Rüdiger Timm
4ca3e88603 INTEGRATION: CWS sb91 (1.54.4); FILE MERGED
2008/07/21 10:56:13 sb 1.54.4.2: RESYNC: (1.54-1.56); FILE MERGED
2008/07/17 15:58:23 sb 1.54.4.1: #i91721# added explicit ENABLE_GCONF (had previously been covered by ENABLE_GNOMEVFS, but unxsolu4 does not support the latter but does support the former)
2008-08-27 12:45:09 +00:00
Ivo Hinkelmann
779ed6034f INTEGRATION: CWS native168 (1.51.40); FILE MERGED
2008/07/10 15:10:35 is 1.51.40.1: #158212# avoid same files at different modules
2008-07-17 15:35:00 +00:00
Ivo Hinkelmann
26d944e07d INTEGRATION: CWS sysui26 (1.50.6); FILE MERGED
2008/06/30 20:21:24 dv 1.50.6.1: #i90335# Moved all binfilter related registry entries to binfilter module
2008-07-16 15:28:02 +00:00
Rüdiger Timm
2c29b1b285 INTEGRATION: CWS jsc21 (1.46.22); FILE MERGED
2008/07/04 11:36:21 jsc 1.46.22.4: RESYNC: (1.50-1.53); FILE MERGED
2008/07/04 06:43:37 jsc 1.46.22.3: #i88797# rework optional SDK
2008/06/11 14:40:48 sb 1.46.22.2: RESYNC: (1.46-1.50); FILE MERGED
2008/04/28 09:29:09 jsc 1.46.22.1: #88797# integrate sdk as optional office module
2008-07-11 13:56:36 +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
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
Rüdiger Timm
edfa689d14 #i10000# Adding custom action for layer links on windows. 2008-06-17 14:56:54 +00:00
Rüdiger Timm
3d63f6daa5 INTEGRATION: CWS sb87 (1.46.16); FILE MERGED
2008/05/19 14:22:35 jsc 1.46.16.1: #i88211# remove shortcut_python.par
2008-06-09 11:54:53 +00:00
Rüdiger Timm
4caf76ae27 INTEGRATION: CWS native151 (1.46.36); FILE MERGED
2008/05/06 15:50:12 is 1.46.36.1: #i79800# binfilter into an own package
2008-06-06 08:45:09 +00:00
Vladimir Glazounov
329f045fda INTEGRATION: CWS ucpgio1 (1.46.34); FILE MERGED
2008/04/30 16:41:36 cmc 1.46.34.1: #i88090# add gio content provider
2008-05-14 14:00:55 +00:00
Kurt Zenker
71d7b6c859 INTEGRATION: CWS obo28_DEV300 (1.46.18); FILE MERGED
2008/04/25 09:58:06 cl 1.46.18.1: #i88518# added missing directxcanvas.par to jre build
2008-05-05 13:14:23 +00:00
Rüdiger Timm
6b29cd6ce7 INTEGRATION: CWS changefileheader (1.45.8); FILE MERGED
2008/03/31 16:07:35 rt 1.45.8.1: #i87441# Change license header to LPGL v3.
2008-04-10 09:04:24 +00:00
Vladimir Glazounov
ac99b4b4ed INTEGRATION: CWS sb83 (1.42.22); FILE MERGED
2008/03/17 09:02:01 sb 1.42.22.8: RESYNC: (1.43-1.44); FILE MERGED
2008/02/14 11:05:31 is 1.42.22.7: '#i86068#_readmes_into_brand_language_pack'
2008/02/06 14:06:50 sb 1.42.22.6: #i84200# moved image sets to brand layer
2008/01/30 12:02:25 sb 1.42.22.5: #i84200# changes for MACOSX; additions to SCP1FILES missing from SCP2FILES
2008/01/30 09:39:44 sb 1.42.22.4: #i84200# dissolve source/ooo/ooobasis.scp into native121 OOo scp files
2008/01/29 16:00:28 sb 1.42.22.3: #i85112# merged in cws_src680_native121
2008/01/09 10:52:32 sb 1.42.22.2: RESYNC: (1.42-1.43); FILE MERGED
2007/12/10 14:49:25 sb 1.42.22.1: #i84200# First step of basis/brand split (OOo w/o URE changed into OOo Basis).
2008-03-18 12:41:43 +00:00
Kurt Zenker
a8eeca4517 INTEGRATION: CWS layout_DEV300 (1.43.36); FILE MERGED
2008/02/12 11:48:34 jcn 1.43.36.1: Initial import of layout-dialogs-config_office-scp2.diff.
2008-03-06 11:47:26 +00:00
Oliver Bolte
e5e9670a70 INTEGRATION: CWS native110 (1.40.46); FILE MERGED
2007/11/28 15:14:56 is 1.40.46.3: RESYNC: (1.41-1.42); FILE MERGED
2007/10/24 12:58:02 is 1.40.46.2: RESYNC: (1.40-1.41); FILE MERGED
2007/10/04 11:04:58 is 1.40.46.1: #i82251# repackaging, part 3
2008-01-04 16:13:28 +00:00
Jens-Heiner Rechtien
ef5e07997b INTEGRATION: CWS dxliberate01 (1.39.100); FILE MERGED
2007/10/01 10:06:54 thb 1.39.100.2: RESYNC: (1.39-1.40); FILE MERGED
2007/08/04 20:32:39 thb 1.39.100.1: #i48454# Made dxcanvas actually appear on OOo builds
2007-11-01 17:05:02 +00:00
Vladimir Glazounov
26420a7858 INTEGRATION: CWS sb71 (1.37.70); FILE MERGED
2007/08/23 18:09:54 sb 1.37.70.3: RESYNC: (1.39-1.40); FILE MERGED
2007/06/15 08:21:55 sb 1.37.70.2: RESYNC: (1.37-1.39); FILE MERGED
2007/04/13 15:27:50 sb 1.37.70.1: #i75466# New OOo-wo-URE product.
2007-10-15 11:57:36 +00:00
Rüdiger Timm
7b10112c33 #i10000# Remove 'ENABLE_HEADLESS'-condition, take 'GUIBASE' instead. 2007-07-27 14:31:38 +00:00
Ivo Hinkelmann
34e7beb248 INTEGRATION: CWS aquabundle (1.37.114); FILE MERGED
2007/05/24 20:52:30 obr 1.37.114.1: #i73693# moved office directory structure up in the Mac OS X bundle and renamed program to MacOS
2007-06-05 10:54:09 +00:00
Vladimir Glazounov
c1c5b94423 INTEGRATION: CWS headless01 (1.37.102); FILE MERGED
2007/05/08 14:05:04 cmc 1.37.102.1: #i76958# add unix headless vcl plug
2007-05-25 13:38:02 +00:00
Oliver Bolte
95ea1f2f3a INTEGRATION: CWS native76 (1.36.6); FILE MERGED
2007/01/10 12:59:33 is 1.36.6.1: #144470# small changes after native50
2007-01-22 13:50:30 +00:00
Jens-Heiner Rechtien
100d63096c INTEGRATION: CWS native50 (1.32.108); FILE MERGED
2006/11/02 12:14:23 is 1.32.108.6: RESYNC: (1.34-1.35); FILE MERGED
2006/08/10 13:39:27 is 1.32.108.5: RESYNC: (1.33-1.34); FILE MERGED
2006/08/10 10:34:47 is 1.32.108.4: #i65425# new java installer
2006/08/07 10:11:10 is 1.32.108.3: #i65425# new java installer
2006/07/21 11:27:39 is 1.32.108.2: RESYNC: (1.32-1.33); FILE MERGED
2006/06/13 09:54:40 is 1.32.108.1: #i65425# shifting file info from solenv to scp
2007-01-02 14:32:01 +00:00
Jens-Heiner Rechtien
177717aa1b INTEGRATION: CWS vq38 (1.34.76); FILE MERGED
2006/10/14 22:32:28 vq 1.34.76.1: #i70432# Rename NETTOOLKIT to DISABLE_ACTIVEX.
2006-10-24 14:35:28 +00:00