Commit graph

74 commits

Author SHA1 Message Date
Thomas Arnhold
3d73801755 odk: remove some dead makefile code 2012-02-14 17:45:25 +01:00
Stephan Bergmann
bcdadc2e9f Resolves rhbz#789622: Adapt SDK to changed paths in LO installation 2012-02-14 10:33:47 +01:00
François Tigeot
4821546a24 Remove unused variable PACKAGE_LIB_DIR 2011-11-30 12:10:58 +01:00
Stephan Bergmann
b786a33cfd Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation. 2011-10-24 13:59:58 +02:00
Matúš Kukan
b50137566f Remove component_getImplementationEnvironment 2011-07-12 16:45:29 +02:00
Caolán McNamara
3c05f4b2fa bad merge, fix to enable extensions to build again 2011-06-24 10:29:09 +01:00
Tor Lillqvist
93e7bea148 This makefile is for a standard Make, so use TABs 2011-06-10 15:35:08 +03:00
Petr Mladek
65a9918180 Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
	odk/settings/settings.mk
2011-04-05 19:08:20 +02:00
Jan Holesovsky
e849c3f54d Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/sdk 2011-03-23 17:13:49 +01:00
Jan Holesovsky
11cdc4ccc4 Merge commit 'ooo/DEV300_m103'
Conflicts:
	odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
	odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
	odk/examples/cpp/complextoolbarcontrols/exports.cxx
	odk/examples/cpp/counter/countermain.cxx
	odk/examples/cpp/remoteclient/remoteclient.cxx
	odk/settings/settings.mk
2011-03-23 16:59:36 +01:00
Fridrich Štrba
3e5ddcfbba Trying to remove NODEFAULTLIB on Windows 2011-03-22 11:11:01 +01:00
Juergen Schmidt
7de486ee0f jsc340: i114609: no visibility compiler flag for jni lib 2011-03-03 14:28:00 +01:00
Juergen Schmidt
8e8fc2abfa jsc340: i114609: adapt examples to work with the URE and use the passive registration 2011-03-01 09:48:57 +01:00
Rene Engelhard
e5d74728e4 fix ODK settings.mk to only set STLPORTLIB if needed
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-02-11 22:42:48 +01:00
Fridrich Štrba
1628005298 Trying to remove the stlport mention from the code 2011-02-09 16:20:25 +01:00
Thomas Arnhold
c7effb5f5d Clean up makefiles 2011-02-02 11:51:53 +01:00
Juergen Schmidt
134b85e8f8 jsc340: i114609: support passive component registration 2011-02-01 18:08:59 +01:00
Juergen Schmidt
1446346432 jsc340: extend proctype check for MacOS 2011-01-27 13:33:00 +01:00
Juergen Schmidt
21f4435c72 jsc340: i115252: check arch for older Mac version 2010-10-28 14:17:41 +02:00
Juergen Schmidt
dade5b09e5 jsc340: i114789: remove space 2010-10-01 14:16:28 +02:00
obo
3839427b7c CWS-TOOLING: integrate CWS gridcontrol04 2010-06-21 14:49:59 +02:00
obo
e7ea89c2b1 CWS-TOOLING: integrate CWS kfreebsdport01v2 2010-06-09 08:34:10 +02:00
Juergen Schmidt
aed6a92dec gridcontrol04: i111555: take care of 64 bit java 2010-06-04 14:23:22 +02:00
Juergen Schmidt
32b0f0d100 sdk321: adapt configuration and build env to work proper with spaces 2010-05-06 18:26:40 +02:00
Rene Engelhard
7e7496bcee kfreebsdport01v2: fix odks settings.mk to add kfreebsd support and add amd64. Remove obsolete gcc version check 2010-05-05 13:18:49 +02:00
Juergen Schmidt
0dd3bad2aa #i106801# check compiler version and options, Mac OS 2009-11-11 07:23:59 +00:00
Juergen Schmidt
40487924f7 #i106627# extend and adapt env for VC9, building manifest, change macro 2009-11-05 14:21:50 +00:00
Juergen Schmidt
17cd6fa13c #i160985# insert new macro ICL to reference innner classes 2009-11-04 10:55:44 +00:00
Juergen Schmidt
53e77ee6fa #i160584# add -D_DLL compiler define for Windows 2009-11-04 10:14:56 +00:00
Vladimir Glazounov
fc2d14be59 CWS-TOOLING: integrate CWS sdk311_DEV300
2009-06-09 10:22:56 +0200 jsc  r272754 : #i101883# adapt number
2009-06-03 13:25:57 +0200 jsc  r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion
2009-06-03 13:20:14 +0200 jsc  r272558 : #i101883# ensure correct archive or package name
2009-06-02 14:56:40 +0200 jsc  r272506 : #i101883# ensure correct archive or package name
2009-05-27 11:26:35 +0200 jsc  r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310@272261 (milestone: OOO310:m12)
2009-05-26 15:15:13 +0200 jsc  r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings
2009-07-06 14:40:18 +00:00
Rüdiger Timm
139151c9b4 INTEGRATION: CWS oobeanfix_DEV300 (1.12.10); FILE MERGED
2008/08/26 13:32:26 jsc 1.12.10.1: #i93126# insert new variable for URE jar files, used in OOBean example makefile
2008-08-27 14:22:10 +00:00
Rüdiger Timm
daf791e97b INTEGRATION: CWS sb91 (1.30.2); FILE MERGED
2008/07/18 12:32:02 sb 1.30.2.1: #i91567# adapted to unxsolu4
2008-08-27 12:50:24 +00:00
Rüdiger Timm
dcf0a2fee6 INTEGRATION: CWS jsc21 (1.3.242); FILE MERGED
2008/05/22 07:07:58 jsc 1.3.242.1: #i88797# adapted to new structure
2008-07-11 13:37:13 +00:00
Rüdiger Timm
9d53b33218 INTEGRATION: CWS jsc21 (1.10.106); FILE MERGED
2008/06/17 07:37:08 jsc 1.10.106.6: #i88797# remove unnecessary space
2008/06/11 14:38:37 sb 1.10.106.5: RESYNC: (1.10-1.11); FILE MERGED
2008/05/27 17:21:19 jsc 1.10.106.4: #i88797# adapt for new structure
2008/05/23 11:38:05 jsc 1.10.106.3: #i88797# adapted for mac
2008/05/22 07:07:57 jsc 1.10.106.2: #i88797# adapted to new structure
2008/04/30 11:34:25 jsc 1.10.106.1: #86121# update for 3 layer office
2008-07-11 13:36:49 +00:00
Rüdiger Timm
fc0ca57f2c INTEGRATION: CWS jsc21 (1.28.2); FILE MERGED
2008/07/07 13:54:10 jsc 1.28.2.9: #i88797# adapt base link flag
2008/06/27 08:49:55 jsc 1.28.2.8: #i90032# adapt link flags and linking for MacOS
2008/06/16 11:22:13 jsc 1.28.2.7: #i88797# adapt solaris compiler options
2008/06/11 14:38:53 sb 1.28.2.6: RESYNC: (1.28-1.29); FILE MERGED
2008/05/27 17:21:19 jsc 1.28.2.5: #i88797# adapt for new structure
2008/05/23 14:34:18 jsc 1.28.2.4: #i88797# adapted for mac
2008/05/23 11:38:05 jsc 1.28.2.3: #i88797# adapted for mac
2008/05/22 07:07:57 jsc 1.28.2.2: #i88797# adapted to new structure
2008/02/11 11:30:29 jsc 1.28.2.1: #i85448# apply patch
2008-07-11 13:36:35 +00:00
Rüdiger Timm
c4c10c17ad INTEGRATION: CWS sb87 (1.10.116); FILE MERGED
2008/05/07 11:34:24 sb 1.10.116.1: #i88687# let Loader call new unoinfo instead of old juh.jar UnoInfo.getJars
2008-06-09 12:08:04 +00:00
Ivo Hinkelmann
9fb1636ab6 INTEGRATION: CWS s390sdk (1.28.18); FILE MERGED
2008/04/24 11:20:46 rene 1.28.18.1: honour just linux
2008-04-25 09:55:55 +00:00
Rüdiger Timm
3d4c36a23d INTEGRATION: CWS newportstl (1.26.2); FILE MERGED
2007/12/19 12:13:29 cmc 1.26.2.3: #i82715# add linux arch that don't match pattern
2007/12/19 12:07:33 cmc 1.26.2.2: #i82715# default to using gcc stl for new (including x86_64) linux ports
2007/12/17 15:26:58 cmc 1.26.2.1: #i82715# default to using gcc stl for new (including x86_64) linux ports
2008-01-29 12:13:29 +00:00
Vladimir Glazounov
458ec3ef2c INTEGRATION: CWS jsc20 (1.26.8); FILE MERGED
2008/01/03 16:01:39 jsc 1.26.8.2: #i80013# adapt link flags to work with URE
2008/01/03 15:25:40 jsc 1.26.8.1: #i80013# use new macro to specify the stlport lib name
2008-01-28 15:31:04 +00:00
Kurt Zenker
3781b76833 INTEGRATION: CWS configure22 (1.23.14); FILE MERGED
2007/10/15 22:46:22 rene 1.23.14.1: #i79874# STLport5 support for configure
2007-12-12 12:28:13 +00:00
Rüdiger Timm
6959c30cc2 #i83538# Undo changes from CWS execshellmacrogone. 2007-11-12 07:10:04 +00:00
Rüdiger Timm
1d0f67aa16 INTEGRATION: CWS execshellmacrogone (1.22.26); FILE MERGED
2007/10/24 08:43:08 rene 1.22.26.2: RESYNC: (1.22-1.23); FILE MERGED
2007/10/24 06:35:42 rene 1.22.26.1: #i79760# krs patches for supressing "Executing shell macro..." output
2007-11-06 15:00:31 +00:00
Jens-Heiner Rechtien
2a30bbcab2 INTEGRATION: CWS jsc18 (1.22.36); FILE MERGED
2007/07/19 07:04:06 jsc 1.22.36.1: #i74573# use quotes for mt command options
2007-07-31 12:58:07 +00:00
Jens-Heiner Rechtien
302477f249 INTEGRATION: CWS configure20 (1.20.50); FILE MERGED
2006/12/18 12:11:38 rene 1.20.50.1: #i72679# add Linux/SPARC
2007-01-03 10:34:35 +00:00
Ivo Hinkelmann
6c4bfb4ac6 INTEGRATION: CWS jsc15 (1.20.46); FILE MERGED
2006/11/27 07:45:54 jsc 1.20.46.1: #i68136# extend script to support VC 2005 Express
2006-12-20 11:26:40 +00:00
Kurt Zenker
4fb6620d43 INTEGRATION: CWS jl44 (1.9.46); FILE MERGED
2006/09/07 13:37:26 jl 1.9.46.1: #i69363# added example for simple license mechanism
2006-10-04 15:22:44 +00:00
Oliver Bolte
6d8176efd2 INTEGRATION: CWS jsc8 (1.19.10); FILE MERGED
2006/07/07 08:32:26 jsc 1.19.10.1: #i66162# insert support for 64bit platform but needs further investigation
2006-07-13 11:03:58 +00:00
Vladimir Glazounov
6db9c5af96 INTEGRATION: CWS jsc3 (1.18.4); FILE MERGED
2006/03/07 13:45:14 jsc 1.18.4.1: #i62434# extend link options for executbales to link libsalcpprt.a, LINUX only
2006-03-15 08:29:54 +00:00
Kurt Zenker
69fe0c3e4b INTEGRATION: CWS jsc5 (1.17.14); FILE MERGED
2006/02/01 09:18:51 jsc 1.17.14.1: #i61438# extend compiler flags for Windows
2006-02-03 16:15:17 +00:00
Rüdiger Timm
53660859bf INTEGRATION: CWS sdkinstaller (1.8.14); FILE MERGED
2005/10/18 11:37:59 jsc 1.8.14.1: #124595# adapted for new installer
2005-11-09 08:37:31 +00:00