diff options
51 files changed, 109 insertions, 436 deletions
diff --git a/basebmp/test/export.map b/basebmp/test/export.map deleted file mode 100644 index 3308588ef6f8..000000000000 --- a/basebmp/test/export.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk index da794dbccb16..ea1c1f9f2d97 100644 --- a/cppuhelper/qa/propertysetmixin/makefile.mk +++ b/cppuhelper/qa/propertysetmixin/makefile.mk @@ -36,6 +36,7 @@ TARGET := qa_propertysetmixin PACKAGE = test/cppuhelper/propertysetmixin/comp ENABLE_EXCEPTIONS := TRUE +VISIBILITY_HIDDEN := TRUE my_components = $(TARGET).cpp $(TARGET).java @@ -53,7 +54,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS) SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)/test_propertysetmixin.obj -SHL1VERSIONMAP = test.map +SHL1USE_EXPORTS = name SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) SHL1IMPLIB = i$(SHL1TARGET) SHL1RPATH = NONE @@ -61,6 +62,7 @@ DEF1NAME = $(SHL1TARGET) SHL2TARGET = $(TARGET).uno SHL2OBJS = $(SLO)/comp_propertysetmixin.obj +SHL2USE_EXPORTS = name SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) SHL2IMPLIB = i$(SHL2TARGET) SH21RPATH = NONE diff --git a/cppuhelper/qa/propertysetmixin/test.map b/cppuhelper/qa/propertysetmixin/test.map deleted file mode 100644 index 3308588ef6f8..000000000000 --- a/cppuhelper/qa/propertysetmixin/test.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk index 16223914e740..54341a3f75d4 100755 --- a/desktop/qa/deployment_misc/makefile.mk +++ b/desktop/qa/deployment_misc/makefile.mk @@ -30,6 +30,7 @@ PRJNAME := desktop TARGET := qa_deployment_misc ENABLE_EXCEPTIONS := TRUE +VISIBILITY_HIDDEN := TRUE .INCLUDE: settings.mk .INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk @@ -45,7 +46,7 @@ CFLAGSCXX += -DDISABLE_PCH_HACK SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)$/test_dp_version.obj SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB) -SHL1VERSIONMAP = version.map +SHL1USE_EXPORTS = name SHL1RPATH = NONE SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/desktop/qa/deployment_misc/version.map b/desktop/qa/deployment_misc/version.map deleted file mode 100755 index 3308588ef6f8..000000000000 --- a/desktop/qa/deployment_misc/version.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk index cc2d79dbf89b..d21c2509131c 100644 --- a/sal/qa/ByteSequence/makefile.mk +++ b/sal/qa/ByteSequence/makefile.mk @@ -30,6 +30,7 @@ PRJNAME = sal TARGET = qa_ByteSequence ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk @@ -44,7 +45,7 @@ SHL1OBJS = $(SLO)/ByteSequence.obj SHL1RPATH = NONE SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) SHL1TARGET = rtl_ByteSequence -SHL1VERSIONMAP = $(PRJ)/qa/export.map +SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk index 4149c58485e9..c9bbe9459ee1 100644 --- a/sal/qa/OStringBuffer/makefile.mk +++ b/sal/qa/OStringBuffer/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_ostringbuffer ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -58,7 +59,7 @@ SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name SHL1RPATH = NONE #------------------------------- All object files ------------------------------- diff --git a/sal/qa/export.map b/sal/qa/export.map deleted file mode 100755 index 3308588ef6f8..000000000000 --- a/sal/qa/export.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk index 9683f20a7dde..0b1d3f6a0499 100644 --- a/sal/qa/osl/condition/makefile.mk +++ b/sal/qa/osl/condition/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_osl_condition ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -52,7 +53,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # ------------------------------------------------------------------ SLOFILES=$(SHL1OBJS) diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk index de85e5e5ef34..db0d257281bd 100644 --- a/sal/qa/osl/file/makefile.mk +++ b/sal/qa/osl/file/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_osl_file ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -48,7 +49,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name #------------------------------------------------------------------- @@ -57,7 +58,7 @@ SHL2TARGET=tcwf SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB=i$(SHL2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def -SHL2VERSIONMAP = $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS = name DEF2NAME =$(SHL2TARGET) @@ -72,7 +73,7 @@ SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL3IMPLIB= i$(SHL3TARGET) DEF3NAME =$(SHL3TARGET) -SHL3VERSIONMAP = $(PRJ)$/qa$/export.map +SHL3USE_EXPORTS = name # END -------------------------------------------------------------- #------------------------------- All object files ------------------------------- diff --git a/sal/qa/osl/getsystempathfromfileurl/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk index 71597ba07f0a..324c238b4a44 100644 --- a/sal/qa/osl/getsystempathfromfileurl/makefile.mk +++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk @@ -34,6 +34,7 @@ PRJNAME = sal TARGET = qa_osl_getsystempathfromfileurl ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN = TRUE .INCLUDE: settings.mk @@ -50,7 +51,7 @@ SHL1OBJS = $(SLO)/test-getsystempathfromfileurl.obj SHL1RPATH = NONE SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) SHL1TARGET = test-getsystempathfromfileurl -SHL1VERSIONMAP = version.map +SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) SLOFILES = $(SHL1OBJS) diff --git a/sal/qa/osl/getsystempathfromfileurl/version.map b/sal/qa/osl/getsystempathfromfileurl/version.map deleted file mode 100644 index ef2ab497cb5e..000000000000 --- a/sal/qa/osl/getsystempathfromfileurl/version.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/sal/qa/osl/module/export_dll.map b/sal/qa/osl/module/export_dll.map deleted file mode 100644 index 879f246ebae1..000000000000 --- a/sal/qa/osl/module/export_dll.map +++ /dev/null @@ -1,35 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - firstfunc; - cppunitTestPlugIn; - - local: - *; -}; diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk index 7fdf0ca43c15..a1ce5511c1b8 100644 --- a/sal/qa/osl/module/makefile.mk +++ b/sal/qa/osl/module/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_module ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -52,8 +53,8 @@ SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB = i$(SHL1TARGET) SHL1DEF = $(MISC)$/$(SHL1TARGET).def DEF1NAME = $(SHL1TARGET) -SHL1VERSIONMAP = export_dll.map - +SHL1USE_EXPORTS = name +SHL1CPPUNITTEST = FALSE # --- main l ------------------------------------------------------ SHL2OBJS= $(SLO)$/osl_Module.obj @@ -73,7 +74,7 @@ SHL2IMPLIB= i$(SHL2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def DEF2NAME =$(SHL2TARGET) -SHL2VERSIONMAP= $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS= name SLOFILES = $(SHL2OBJS) diff --git a/sal/qa/osl/module/osl_Module_DLL.cxx b/sal/qa/osl/module/osl_Module_DLL.cxx index 8dd3ba900870..8ceecb474941 100644 --- a/sal/qa/osl/module/osl_Module_DLL.cxx +++ b/sal/qa/osl/module/osl_Module_DLL.cxx @@ -39,7 +39,7 @@ // But we instatiate a test plugin to fake the build process. CPPUNIT_PLUGIN_IMPLEMENT(); -extern "C" sal_Bool SAL_CALL firstfunc( sal_Bool bRes ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL firstfunc( sal_Bool bRes ) { return ( bRes = sal_True ); } diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk index 73360cbd04d9..e73c7a8377e3 100644 --- a/sal/qa/osl/process/makefile.mk +++ b/sal/qa/osl/process/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_osl_process ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -47,14 +48,14 @@ SHL1TARGET=osl_Thread SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB=i$(SHL1TARGET) DEF1NAME=$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name SHL2OBJS=$(SLO)$/osl_process.obj SHL2TARGET=osl_process SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB=i$(SHL2TARGET) DEF2NAME=$(SHL2TARGET) -SHL2VERSIONMAP = $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS = name OBJ3FILES=$(OBJ)$/osl_process_child.obj APP3TARGET=osl_process_child diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk index 85d9beb44972..00c946a84514 100755 --- a/sal/qa/osl/security/makefile.mk +++ b/sal/qa/osl/security/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_osl_security ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -56,7 +57,7 @@ SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name SLOFILES = $(SHL1OBJS) diff --git a/sal/qa/osl/setthreadname/version.map b/sal/qa/osl/setthreadname/version.map deleted file mode 100644 index ef2ab497cb5e..000000000000 --- a/sal/qa/osl/setthreadname/version.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk index cdc268a2402a..b6434e83abf1 100755 --- a/sal/qa/osl/socket/makefile.mk +++ b/sal/qa/osl/socket/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_osl_socket ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -59,7 +60,7 @@ SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ @@ -71,7 +72,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME= $(SHL2TARGET) -SHL2VERSIONMAP = $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS = name # END -------------------------------------------------------------- @@ -94,7 +95,7 @@ SHL3STDLIBS += -ldl -lnsl SHL3IMPLIB= i$(SHL3TARGET) DEF3NAME= $(SHL3TARGET) -SHL3VERSIONMAP = $(PRJ)$/qa$/export.map +SHL3USE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ @@ -117,7 +118,7 @@ SHL4STDLIBS += -ldl -lnsl SHL4IMPLIB= i$(SHL4TARGET) DEF4NAME= $(SHL4TARGET) -SHL4VERSIONMAP = $(PRJ)$/qa$/export.map +SHL4VUSE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ @@ -140,7 +141,7 @@ SHL5STDLIBS += -ldl -lnsl SHL5IMPLIB= i$(SHL5TARGET) DEF5NAME= $(SHL5TARGET) -SHL5VERSIONMAP = $(PRJ)$/qa$/export.map +SHL5USE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ @@ -163,7 +164,7 @@ SHL6STDLIBS += -ldl -lnsl SHL6IMPLIB= i$(SHL6TARGET) DEF6NAME= $(SHL6TARGET) -SHL6VERSIONMAP = $(PRJ)$/qa$/export.map +SHL6USE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ @@ -186,7 +187,7 @@ SHL7STDLIBS += -ldl -lnsl SHL7IMPLIB= i$(SHL7TARGET) DEF7NAME= $(SHL7TARGET) -SHL7VERSIONMAP = $(PRJ)$/qa$/export.map +SHL7USE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ @@ -209,7 +210,7 @@ SHL8STDLIBS += -ldl -lnsl SHL8IMPLIB= i$(SHL8TARGET) DEF8NAME= $(SHL8TARGET) -SHL8VERSIONMAP = $(PRJ)$/qa$/export.map +SHL8USE_EXPORTS = name # auto generated Target:Socket # END ------------------------------------------------------------------ diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk index 1a015da3bdfd..d00a893254ae 100755 --- a/sal/qa/rtl/alloc/makefile.mk +++ b/sal/qa/rtl/alloc/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_rtl_alloc ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -52,7 +53,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name #------------------------------- All object files ------------------------------- SLOFILES=$(SHL1OBJS) diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk index c1b9c2f3e658..4fda4aedc911 100644 --- a/sal/qa/rtl/bootstrap/makefile.mk +++ b/sal/qa/rtl/bootstrap/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=rtl_bootstrap ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -61,7 +62,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name # END ------------------------------------------------------------------ OBJ2FILES=$(OBJ)$/bootstrap_process.obj diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk index fd95355ac912..a52f40249103 100644 --- a/sal/qa/rtl/cipher/makefile.mk +++ b/sal/qa/rtl/cipher/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=qa_rtl_cipher ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -57,7 +58,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF2EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name #------------------------------- All object files ------------------------------- SLOFILES=$(SHL1OBJS) diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk index 3820a8cf7422..f3b70296b58c 100755 --- a/sal/qa/rtl/crc32/makefile.mk +++ b/sal/qa/rtl/crc32/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_rtl_crc32 ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -55,7 +56,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name #------------------------------- All object files ------------------------------- SLOFILES=$(SHL1OBJS) diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk index d6c557f7dd0f..7febc4d80914 100644 --- a/sal/qa/rtl/digest/makefile.mk +++ b/sal/qa/rtl/digest/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=rtl_digest ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -49,7 +50,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME= $(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name #------------------------------- All object files ------------------------------- SLOFILES= \ diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk index a1d03567306f..a718edf0e89d 100644 --- a/sal/qa/rtl/doublelock/makefile.mk +++ b/sal/qa/rtl/doublelock/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_rtl_doublelock ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -56,7 +57,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name #------------------------------- All object files ------------------------------- SLOFILES=$(SHL1OBJS) diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk index 0d1c8f83fb46..4c8d453f5151 100644 --- a/sal/qa/rtl/locale/makefile.mk +++ b/sal/qa/rtl/locale/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_rtl_locale ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -55,7 +56,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name #------------------------------- All object files ------------------------------- SLOFILES=$(SHL1OBJS) diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk index 6660011f3213..a8c4ebae81ef 100644 --- a/sal/qa/rtl/logfile/makefile.mk +++ b/sal/qa/rtl/logfile/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_rtl_logfile ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -49,7 +50,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # END -------------------------------------------------------------- diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk index 5436736cdf36..e88585b3b40f 100644 --- a/sal/qa/rtl/ostring/makefile.mk +++ b/sal/qa/rtl/ostring/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=qa_rtl_ostring2 ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -55,7 +56,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF2EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name # auto generated Target:joblist # END ------------------------------------------------------------------ @@ -68,7 +69,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) -SHL2VERSIONMAP= $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS= name # END ------------------------------------------------------------------ # BEGIN ---------------------------------------------------------------- @@ -80,7 +81,7 @@ SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL3IMPLIB= i$(SHL3TARGET) DEF3NAME =$(SHL3TARGET) -SHL3VERSIONMAP= $(PRJ)$/qa$/export.map +SHL3USE_EXPORTS= name # END ------------------------------------------------------------------ #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk index b84860357a9c..1c0fd00300c3 100644 --- a/sal/qa/rtl/oustring/makefile.mk +++ b/sal/qa/rtl/oustring/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=rtl_oustring2 ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -55,7 +56,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name # auto generated Target:joblist # END ------------------------------------------------------------------ @@ -68,7 +69,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) -SHL2VERSIONMAP= $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS= name # END ------------------------------------------------------------------ #------------------------------- All object files ------------------------------- diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk index 0db90281a929..80cff0885b75 100644 --- a/sal/qa/rtl/oustringbuffer/makefile.mk +++ b/sal/qa/rtl/oustringbuffer/makefile.mk @@ -31,6 +31,7 @@ PRJNAME := sal TARGET := qa_rtl_oustringbuffer ENABLE_EXCEPTIONS := TRUE +VISIBILITY_HIDDEN=TRUE .INCLUDE: settings.mk @@ -50,7 +51,7 @@ SHL1OBJS := \ $(SLO)$/test_oustringbuffer_noadditional.obj SHL1IMPLIB := i$(SHL1TARGET) SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) -SHL1VERSIONMAP := $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS := name DEF1NAME := $(SHL1TARGET) .INCLUDE: target.mk diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk index e3a26c9311ad..1fe36d9341ea 100644 --- a/sal/qa/rtl/process/makefile.mk +++ b/sal/qa/rtl/process/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=rtl_Process ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -53,7 +54,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name # END ------------------------------------------------------------------ OBJ3FILES=$(OBJ)$/child_process.obj diff --git a/sal/qa/rtl/random/makefile.add b/sal/qa/rtl/random/makefile.add deleted file mode 100644 index eb45c312ed40..000000000000 --- a/sal/qa/rtl/random/makefile.add +++ /dev/null @@ -1,19 +0,0 @@ -# BEGIN ---------------------------------------------------------------- -# auto generated Target:job by codegen.pl -SHL1OBJS= \ - $(SLO)$/rtl_random.obj - -SHL1TARGET= job -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPUNITLIB) - -SHL1IMPLIB= i$(SHL1TARGET) -# SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME =$(SHL1TARGET) -# DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= export.map -# auto generated Target:job -# END ------------------------------------------------------------------ - diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk index ef5a86cedd15..a90459507851 100644 --- a/sal/qa/rtl/random/makefile.mk +++ b/sal/qa/rtl/random/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_rtl_random ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -46,7 +47,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name #------------------------------- All object files ------------------------------- SLOFILES= \ diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk index c58476e5918f..12f007123c06 100644 --- a/sal/qa/rtl/strings/makefile.mk +++ b/sal/qa/rtl/strings/makefile.mk @@ -31,6 +31,7 @@ PRJNAME := sal TARGET := qa_rtl_strings ENABLE_EXCEPTIONS := TRUE +VISIBILITY_HIDDEN := TRUE .INCLUDE: settings.mk @@ -51,7 +52,7 @@ SHL1OBJS := \ $(SLO)$/test_oustring_noadditional.obj SHL1IMPLIB := i$(SHL1TARGET) SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) -SHL1VERSIONMAP := $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS := name DEF1NAME := $(SHL1TARGET) .INCLUDE: target.mk diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk index 4e6126235a1d..a7952a706158 100644 --- a/sal/qa/rtl/textenc/makefile.mk +++ b/sal/qa/rtl/textenc/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_rtl_textenc ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -49,7 +50,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # END -------------------------------------------------------------- @@ -61,7 +62,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) -SHL2VERSIONMAP = $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS = name # END -------------------------------------------------------------- diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk index 5d3fc19dc1ec..f91db1e33c6b 100644 --- a/sal/qa/rtl/uri/makefile.mk +++ b/sal/qa/rtl/uri/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_rtl_uritest ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -49,7 +50,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # END -------------------------------------------------------------- @@ -61,7 +62,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) -SHL2VERSIONMAP = $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS = name # END -------------------------------------------------------------- diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk index ff1dc961f095..e6ce02dbf414 100644 --- a/sal/qa/rtl/uuid/makefile.mk +++ b/sal/qa/rtl/uuid/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=rtl_uuid ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -55,7 +56,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name # END ------------------------------------------------------------------ #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies diff --git a/sal/qa/rtl_strings/makefile.mk b/sal/qa/rtl_strings/makefile.mk index b319fbf6845b..eb370f81572d 100644 --- a/sal/qa/rtl_strings/makefile.mk +++ b/sal/qa/rtl_strings/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sal TARGET=qa_rtl_strings ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -52,7 +53,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # auto generated Target:FileBase # END ------------------------------------------------------------------ @@ -71,7 +72,7 @@ SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME =$(SHL2TARGET) # DEF2EXPORTFILE= export.exp -SHL2VERSIONMAP = $(PRJ)$/qa$/export.map +SHL2USE_EXPORTS = name # auto generated Target:FileBase # END ------------------------------------------------------------------ @@ -90,7 +91,7 @@ SHL3IMPLIB= i$(SHL3TARGET) DEF3NAME =$(SHL3TARGET) # DEF3EXPORTFILE= export.exp -SHL3VERSIONMAP = $(PRJ)$/qa$/export.map +SHL3USE_EXPORTS = name # auto generated Target:FileBase # END ------------------------------------------------------------------ @@ -104,7 +105,7 @@ SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL4IMPLIB= i$(SHL4TARGET) DEF4NAME =$(SHL4TARGET) -SHL4VERSIONMAP = $(PRJ)$/qa$/export.map +SHL4USE_EXPORTS = name # END ------------------------------------------------------------------ @@ -117,7 +118,7 @@ SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL5IMPLIB= i$(SHL5TARGET) DEF5NAME =$(SHL5TARGET) -SHL5VERSIONMAP = $(PRJ)$/qa$/export.map +SHL5USE_EXPORTS = name # END ------------------------------------------------------------------ @@ -130,7 +131,7 @@ SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL6IMPLIB= i$(SHL6TARGET) DEF6NAME =$(SHL6TARGET) -SHL6VERSIONMAP = $(PRJ)$/qa$/export.map +SHL6USE_EXPORTS = name # END ------------------------------------------------------------------ diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk index 0677acc24bd6..6457a4209192 100644 --- a/sal/qa/sal/makefile.mk +++ b/sal/qa/sal/makefile.mk @@ -30,6 +30,7 @@ PRJNAME := sal TARGET := qa_sal ENABLE_EXCEPTIONS := TRUE +VISIBILITY_HIDDEN := TRUE .INCLUDE: settings.mk @@ -40,7 +41,7 @@ CFLAGSCXX += -DCPPUNIT_PLUGIN_EXPORTED_NAME=cppunitTest_$(TARGET) SHL1TARGET = $(TARGET)_types SHL1OBJS = $(SLO)$/test_types.obj SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/sal/qa/systools/makefile.mk b/sal/qa/systools/makefile.mk index 7b3798b7413b..60afecafa559 100644 --- a/sal/qa/systools/makefile.mk +++ b/sal/qa/systools/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=sal TARGET=test_comtools ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -55,7 +56,7 @@ SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS= name # auto generated Target:joblist # END ------------------------------------------------------------------ diff --git a/sal/qa/testHelperFunctions/makefile.mk b/sal/qa/testHelperFunctions/makefile.mk index e7c2f9887e21..603f57357378 100644 --- a/sal/qa/testHelperFunctions/makefile.mk +++ b/sal/qa/testHelperFunctions/makefile.mk @@ -31,6 +31,7 @@ PRJNAME=sal TARGET=qa_testHelperFunctions ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -49,7 +50,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL1IMPLIB= i$(SHL1TARGET) DEF1NAME =$(SHL1TARGET) -SHL1VERSIONMAP = $(PRJ)$/qa$/export.map +SHL1USE_EXPORTS = name # END -------------------------------------------------------------- diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk index 229a038cd700..f30d6d2fa545 100644 --- a/sax/qa/cppunit/makefile.mk +++ b/sax/qa/cppunit/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=sax TARGET=qa_cppunit ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -61,7 +62,7 @@ SHL1IMPLIB= i$(SHL1TARGET) # SHL1DEF= $(MISC)/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) # DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= version.map +SHL1USE_EXPORTS= name # --- All object files --------------------------------------------- diff --git a/sax/qa/cppunit/version.map b/sax/qa/cppunit/version.map deleted file mode 100644 index 3308588ef6f8..000000000000 --- a/sax/qa/cppunit/version.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 799fe9c221ca..999d209c2a85 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -28,6 +28,7 @@ PRJNAME = smoketestoo_native TARGET = smoketest ENABLE_EXCEPTIONS = TRUE +VISIBILITY_HIDDEN = TRUE ABORT_ON_ASSERTION = TRUE @@ -37,11 +38,12 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS) SLOFILES = $(SHL1OBJS) +SHL1IMPLIB = i$(SHL1TARGET) SHL1TARGET = smoketest SHL1OBJS = $(SLO)/smoketest.obj SHL1RPATH = NONE SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTLIB) -SHL1VERSIONMAP = version.map +SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index 76acb326c429..447d12eac092 100644 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -48,17 +48,12 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/util/URL.hpp" - #include "cppuhelper/implbase1.hxx" -#include "cppunit/TestAssert.h" -#include "cppunit/TestFixture.h" -#include "cppunit/extensions/HelperMacros.h" -#include "cppunit/plugin/TestPlugIn.h" - #include "osl/conditn.hxx" #include "osl/diagnose.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" +#include "sal/cppunit.h" #include "test/gettestargument.hxx" #include "test/officeconnection.hxx" #include "test/oustringostreaminserter.hxx" diff --git a/smoketestoo_native/version.map b/smoketestoo_native/version.map deleted file mode 100644 index 00a28463c5d2..000000000000 --- a/smoketestoo_native/version.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#***********************************************************************/ - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk index 85804dd41ac6..8f9f973716ab 100644 --- a/solenv/inc/_cppunit.mk +++ b/solenv/inc/_cppunit.mk @@ -1,7 +1,7 @@ # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL1TARGETN)"!="" +.IF "$(SHL1TARGETN)"!="" && "$(SHL1CPPUNITTEST)"!="FALSE" ALLTAR : test1 test1 .PHONY : $(SHL1TARGETN) @echo ---------------------------------------------------------- @@ -13,7 +13,7 @@ test1 .PHONY : $(SHL1TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL2TARGETN)"!="" +.IF "$(SHL2TARGETN)"!="" && "$(SHL2CPPUNITTEST)"!="FALSE" ALLTAR : test2 test2 .PHONY : $(SHL2TARGETN) @echo ---------------------------------------------------------- @@ -25,7 +25,7 @@ test2 .PHONY : $(SHL2TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL3TARGETN)"!="" +.IF "$(SHL3TARGETN)"!="" && "$(SHL3CPPUNITTEST)"!="FALSE" ALLTAR : test3 test3 .PHONY : $(SHL3TARGETN) @echo ---------------------------------------------------------- @@ -37,7 +37,7 @@ test3 .PHONY : $(SHL3TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL4TARGETN)"!="" +.IF "$(SHL4TARGETN)"!="" && "$(SHL4CPPUNITTEST)"!="FALSE" ALLTAR : test4 test4 .PHONY : $(SHL4TARGETN) @echo ---------------------------------------------------------- @@ -49,7 +49,7 @@ test4 .PHONY : $(SHL4TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL5TARGETN)"!="" +.IF "$(SHL5TARGETN)"!="" && "$(SHL5CPPUNITTEST)"!="FALSE" ALLTAR : test5 test5 .PHONY : $(SHL5TARGETN) @echo ---------------------------------------------------------- @@ -61,7 +61,7 @@ test5 .PHONY : $(SHL5TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL6TARGETN)"!="" +.IF "$(SHL6TARGETN)"!="" && "$(SHL6CPPUNITTEST)"!="FALSE" ALLTAR : test6 test6 .PHONY : $(SHL6TARGETN) @echo ---------------------------------------------------------- @@ -73,7 +73,7 @@ test6 .PHONY : $(SHL6TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL7TARGETN)"!="" +.IF "$(SHL7TARGETN)"!="" && "$(SHL7CPPUNITTEST)"!="FALSE" ALLTAR : test7 test7 .PHONY : $(SHL7TARGETN) @echo ---------------------------------------------------------- @@ -85,7 +85,7 @@ test7 .PHONY : $(SHL7TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL8TARGETN)"!="" +.IF "$(SHL8TARGETN)"!="" && "$(SHL8CPPUNITTEST)"!="FALSE" ALLTAR : test8 test8 .PHONY : $(SHL8TARGETN) @echo ---------------------------------------------------------- @@ -97,7 +97,7 @@ test8 .PHONY : $(SHL8TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL9TARGETN)"!="" +.IF "$(SHL9TARGETN)"!="" && "$(SHL9CPPUNITTEST)"!="FALSE" ALLTAR : test9 test9 .PHONY : $(SHL9TARGETN) @echo ---------------------------------------------------------- @@ -109,7 +109,7 @@ test9 .PHONY : $(SHL9TARGETN) # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL10TARGETN)"!="" +.IF "$(SHL10TARGETN)"!="" && "$(SHL10CPPUNITTEST)"!="FALSE" ALLTAR : test10 test10 .PHONY : $(SHL10TARGETN) @echo ---------------------------------------------------------- diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk index b30ca7152700..af3639138fb2 100644 --- a/solenv/inc/cppunit.mk +++ b/solenv/inc/cppunit.mk @@ -44,7 +44,7 @@ # unroll begin # ---- create the test libraries ------------------------------------ -.IF "$(SHL$(TNR)TARGETN)"!="" +.IF "$(SHL$(TNR)TARGETN)"!="" && "$(SHL$(TNR)CPPUNITTEST)"!="FALSE" ALLTAR : test$(TNR) test$(TNR) .PHONY : $(SHL$(TNR)TARGETN) @echo ---------------------------------------------------------- diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk index 05ffd5fdd210..68ebd3d67fa2 100644 --- a/stoc/test/uriproc/makefile.mk +++ b/stoc/test/uriproc/makefile.mk @@ -34,6 +34,7 @@ PRJNAME := stoc TARGET := test_uriproc ENABLE_EXCEPTIONS := TRUE +VISIBILITY_HIDDEN := TRUE my_components = stocservices @@ -45,7 +46,7 @@ DLLPRE = # no leading "lib" on .so files SHL1TARGET = $(TARGET) SHL1OBJS = $(SLO)/test_uriproc.obj SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) -SHL1VERSIONMAP = version.map +SHL1USE_EXPORTS = name SHL1RPATH = NONE SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index 34ac40b504de..4859c87e6b09 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -26,8 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" +#include "sal/config.h" +#include "sal/precppunit.hxx" #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" diff --git a/stoc/test/uriproc/version.map b/stoc/test/uriproc/version.map deleted file mode 100644 index 3308588ef6f8..000000000000 --- a/stoc/test/uriproc/version.map +++ /dev/null @@ -1,34 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - cppunitTestPlugIn; - - local: - *; -}; |