From 0416c98d433be40fe2e2d0199ebaa8d029e8e338 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 30 Dec 2008 13:32:01 +0000 Subject: CWS-TOOLING: integrate CWS sb102 2008-12-11 16:18:12 +0100 sb r265332 : #i95065# cleanup, to make Windows linking work 2008-12-11 16:16:03 +0100 sb r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT 2008-12-09 17:40:28 +0100 sb r265122 : #i94469# move CJK specific configuration data to brand layer 2008-12-09 16:09:08 +0100 sb r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms 2008-12-09 15:54:31 +0100 sb r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC 2008-12-09 15:40:51 +0100 sb r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab 2008-12-09 15:36:21 +0100 sb r265102 : #i95501# updated SDK_HOME 2008-12-09 15:31:46 +0100 sb r265099 : typo (temppath vs. tmppath) 2008-12-08 11:48:08 +0100 sb r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory) 2008-12-07 19:41:07 +0100 sb r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X 2008-12-06 23:54:49 +0100 sb r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS 2008-12-05 20:29:23 +0100 sb r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file 2008-12-05 15:37:23 +0100 sb r264908 : #i95315# removed obsolete jut 2008-12-05 15:34:59 +0100 sb r264907 : #i95531# removed empty obsolete directories 2008-12-05 10:09:23 +0100 sb r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37) 2008-12-04 14:50:20 +0100 sb r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does 2008-12-03 11:29:38 +0100 sb r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all) 2008-12-02 17:18:31 +0100 sb r264724 : #i96809# silenced GCC 4.3.2 warning 2008-12-02 13:29:34 +0100 sb r264695 : #i96797# make get_tmp_dir fail less often 2008-11-28 17:19:24 +0100 sb r264566 : #i95691# inadvertently missing from -c 264564 2008-11-28 17:07:50 +0100 sb r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers 2008-11-25 13:28:08 +0100 sb r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np) 2008-11-21 14:45:22 +0100 sb r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE 2008-11-19 13:19:37 +0100 sb r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties --- configmgr/inc/makefile.mk | 1 + configmgr/makefile.pmk | 32 ++++++++++++++++++++++++++ configmgr/source/api/makefile.mk | 1 + configmgr/source/api2/makefile.mk | 1 + configmgr/source/backend/makefile.mk | 1 + configmgr/source/backendhelper/componentdf.cxx | 15 +++++++----- configmgr/source/backendhelper/makefile.mk | 1 + configmgr/source/data/makefile.mk | 1 + configmgr/source/localbe/makefile.mk | 2 ++ configmgr/source/misc/configunoreg.cxx | 7 +++--- configmgr/source/misc/makefile.mk | 1 + configmgr/source/platformbe/componentdefn.cxx | 15 +++++++----- configmgr/source/platformbe/makefile.mk | 1 + configmgr/source/registry/makefile.mk | 1 + configmgr/source/tree/makefile.mk | 1 + configmgr/source/treecache/makefile.mk | 1 + configmgr/source/treemgr/makefile.mk | 1 + configmgr/source/xml/makefile.mk | 1 + configmgr/util/makefile.mk | 1 + 19 files changed, 70 insertions(+), 15 deletions(-) create mode 100644 configmgr/makefile.pmk (limited to 'configmgr') diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk index 4d01475e833a..5637340c04c4 100644 --- a/configmgr/inc/makefile.mk +++ b/configmgr/inc/makefile.mk @@ -36,6 +36,7 @@ TARGET=inc # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files -------------------------------------------------------- # --- Targets ------------------------------------------------------- diff --git a/configmgr/makefile.pmk b/configmgr/makefile.pmk new file mode 100644 index 000000000000..0ef67b43696b --- /dev/null +++ b/configmgr/makefile.pmk @@ -0,0 +1,32 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: $ +# +# $Revision: $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +VISIBILITY_HIDDEN = TRUE diff --git a/configmgr/source/api/makefile.mk b/configmgr/source/api/makefile.mk index d80b4c77b38d..3d601f5b99eb 100644 --- a/configmgr/source/api/makefile.mk +++ b/configmgr/source/api/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files ------------------------------------- diff --git a/configmgr/source/api2/makefile.mk b/configmgr/source/api2/makefile.mk index f5c9ca479297..cb79cf0f3e5b 100644 --- a/configmgr/source/api2/makefile.mk +++ b/configmgr/source/api2/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files ------------------------------------- diff --git a/configmgr/source/backend/makefile.mk b/configmgr/source/backend/makefile.mk index d5f3a13073e2..97e372929fb7 100644 --- a/configmgr/source/backend/makefile.mk +++ b/configmgr/source/backend/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings --- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files --- diff --git a/configmgr/source/backendhelper/componentdf.cxx b/configmgr/source/backendhelper/componentdf.cxx index 643997268fe9..ff36f410ceda 100644 --- a/configmgr/source/backendhelper/componentdf.cxx +++ b/configmgr/source/backendhelper/componentdf.cxx @@ -60,7 +60,8 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; //------------------------------------------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /* ppEnv */ ) @@ -69,17 +70,19 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager, - void *aRegistryKey) { +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + void *aServiceManager, void *aRegistryKey) +{ return cppu::component_writeInfoHelper(aServiceManager, aRegistryKey, kImplementations_entries) ; } //------------------------------------------------------------------------------ -extern "C" void *component_getFactory(const sal_Char *aImplementationName, - void *aServiceManager, - void *aRegistryKey) { +extern "C" SAL_DLLPUBLIC_EXPORT void *component_getFactory( + const sal_Char *aImplementationName, void *aServiceManager, + void *aRegistryKey) +{ return cppu::component_getFactoryHelper(aImplementationName, aServiceManager, aRegistryKey, diff --git a/configmgr/source/backendhelper/makefile.mk b/configmgr/source/backendhelper/makefile.mk index e3fe0e1367dd..44b502b451b4 100644 --- a/configmgr/source/backendhelper/makefile.mk +++ b/configmgr/source/backendhelper/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings --- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk DLLPRE = # --- Files --- diff --git a/configmgr/source/data/makefile.mk b/configmgr/source/data/makefile.mk index 83e55e27efdf..5745979c1bed 100644 --- a/configmgr/source/data/makefile.mk +++ b/configmgr/source/data/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk .INCLUDE : $(PRJ)$/version.mk # --- Files ------------------------------------- diff --git a/configmgr/source/localbe/makefile.mk b/configmgr/source/localbe/makefile.mk index 9afb7c9f64da..5462836be4d7 100644 --- a/configmgr/source/localbe/makefile.mk +++ b/configmgr/source/localbe/makefile.mk @@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk + # --- Files ------------------------------------- SLOFILES=\ diff --git a/configmgr/source/misc/configunoreg.cxx b/configmgr/source/misc/configunoreg.cxx index 1efcbfe564e9..203acca20479 100644 --- a/configmgr/source/misc/configunoreg.cxx +++ b/configmgr/source/misc/configunoreg.cxx @@ -192,7 +192,8 @@ struct ServiceImplementationRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT +void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /* ppEnv */ ) @@ -201,7 +202,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey ) @@ -265,7 +266,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/configmgr/source/misc/makefile.mk b/configmgr/source/misc/makefile.mk index 89272073fe17..8fc6389dc9b5 100644 --- a/configmgr/source/misc/makefile.mk +++ b/configmgr/source/misc/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk .INCLUDE : $(PRJ)$/version.mk # --- Files ------------------------------------- diff --git a/configmgr/source/platformbe/componentdefn.cxx b/configmgr/source/platformbe/componentdefn.cxx index 540f4ae07a32..61666ad38e64 100644 --- a/configmgr/source/platformbe/componentdefn.cxx +++ b/configmgr/source/platformbe/componentdefn.cxx @@ -60,7 +60,8 @@ static const cppu::ImplementationEntry kImplementations_entries[] = } ; //------------------------------------------------------------------------------ -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /* ppEnv */ ) @@ -70,17 +71,19 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void *aServiceManager, - void *aRegistryKey) { +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + void *aServiceManager, void *aRegistryKey) +{ return cppu::component_writeInfoHelper(aServiceManager, aRegistryKey, kImplementations_entries) ; } //------------------------------------------------------------------------------ -extern "C" void *component_getFactory(const sal_Char *aImplementationName, - void *aServiceManager, - void *aRegistryKey) { +extern "C" SAL_DLLPUBLIC_EXPORT void *component_getFactory( + const sal_Char *aImplementationName, void *aServiceManager, + void *aRegistryKey) +{ return cppu::component_getFactoryHelper(aImplementationName, aServiceManager, aRegistryKey, diff --git a/configmgr/source/platformbe/makefile.mk b/configmgr/source/platformbe/makefile.mk index a9c3f870f21d..19796b2442c2 100644 --- a/configmgr/source/platformbe/makefile.mk +++ b/configmgr/source/platformbe/makefile.mk @@ -42,6 +42,7 @@ SYSMGR_MAJOR=1 # --- Settings --- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk DLLPRE = # --- Files --- diff --git a/configmgr/source/registry/makefile.mk b/configmgr/source/registry/makefile.mk index a92162b3271d..3a8c12c8f573 100644 --- a/configmgr/source/registry/makefile.mk +++ b/configmgr/source/registry/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files ------------------------------------- SLOFILES=\ diff --git a/configmgr/source/tree/makefile.mk b/configmgr/source/tree/makefile.mk index 019b3cc17f2f..41cf2e0c5f8f 100644 --- a/configmgr/source/tree/makefile.mk +++ b/configmgr/source/tree/makefile.mk @@ -43,6 +43,7 @@ ENVCFLAGS+=/FR$(SLO)$/ .ENDIF .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files --- diff --git a/configmgr/source/treecache/makefile.mk b/configmgr/source/treecache/makefile.mk index c9f2da8a7c93..d8649085bbe7 100644 --- a/configmgr/source/treecache/makefile.mk +++ b/configmgr/source/treecache/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files ------------------------------------- diff --git a/configmgr/source/treemgr/makefile.mk b/configmgr/source/treemgr/makefile.mk index 5feebe58d355..ba98a6a161ef 100644 --- a/configmgr/source/treemgr/makefile.mk +++ b/configmgr/source/treemgr/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk # --- Files ------------------------------------- diff --git a/configmgr/source/xml/makefile.mk b/configmgr/source/xml/makefile.mk index 0c7c68f48f1e..61d3ac65572f 100644 --- a/configmgr/source/xml/makefile.mk +++ b/configmgr/source/xml/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings --- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk .IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" CFLAGSCXX+=-instances=static diff --git a/configmgr/util/makefile.mk b/configmgr/util/makefile.mk index 423f5828ec1c..6fd7c63195a4 100644 --- a/configmgr/util/makefile.mk +++ b/configmgr/util/makefile.mk @@ -36,6 +36,7 @@ TARGET=configmgr ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/makefile.pmk .INCLUDE : $(PRJ)$/version.mk DLLPRE = -- cgit