1. mst
  2. ooo340

Commits

s...@openoffice.org  committed 05a6536

sb140: #i117694# some CppUnit related cleanup

  • Participants
  • Parent commits 375ee2c
  • Branches default

Comments (0)

Files changed (60)

File basebmp/test/export.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File basebmp/test/makefile.mk

View file
 TARGETTYPE=GUI
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 
 .ENDIF

File basegfx/test/export.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File basegfx/test/makefile.mk

View file
 TARGET=tests
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 
 # END ------------------------------------------------------------------

File cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx

View file
 
 }
 
-extern "C" void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
 
-extern "C" void SAL_CALL component_getImplementationEnvironment(
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
     char const ** envTypeName, uno_Environment **)
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;

File cppuhelper/qa/propertysetmixin/makefile.mk

View file
 PACKAGE = test/cppuhelper/propertysetmixin/comp
 
 ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN := TRUE
 
 my_components = $(TARGET).cpp $(TARGET).java
 
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)/test_propertysetmixin.obj
-SHL1VERSIONMAP = test.map
+SHL1USE_EXPORTS = name
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1RPATH = NONE
 
 SHL2TARGET = $(TARGET).uno
 SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
+SHL2USE_EXPORTS = name
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2IMPLIB = i$(SHL2TARGET)
 SH21RPATH = NONE

File cppuhelper/qa/propertysetmixin/test.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File desktop/qa/deployment_misc/makefile.mk

View file
 TARGET := qa_deployment_misc
 
 ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN := TRUE
 
 .INCLUDE: settings.mk
 .INCLUDE: $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 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)

File desktop/qa/deployment_misc/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File o3tl/qa/export.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File o3tl/qa/makefile.mk

View file
 TARGET=tests
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 
 # END ------------------------------------------------------------------

File sal/qa/ByteSequence/makefile.mk

View file
 TARGET = qa_ByteSequence
 
 ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
 SHL1RPATH = NONE
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
 SHL1TARGET = rtl_ByteSequence
-SHL1VERSIONMAP = $(PRJ)/qa/export.map
+SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)

File sal/qa/OStringBuffer/makefile.mk

View file
 TARGET=qa_ostringbuffer
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 
 #------------------------------- All object files -------------------------------

File sal/qa/export.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File sal/qa/osl/condition/makefile.mk

View file
 TARGET=qa_osl_condition
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 # auto generated Target:Condition
 # END ------------------------------------------------------------------
 

File sal/qa/osl/file/makefile.mk

View file
 TARGET=qa_osl_file
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 #-------------------------------------------------------------------
 
 SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 SHL2IMPLIB=i$(SHL2TARGET)
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS = name
 DEF2NAME    =$(SHL2TARGET)
 
 
 SHL3IMPLIB= i$(SHL3TARGET)
 
 DEF3NAME    =$(SHL3TARGET)
-SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL3USE_EXPORTS = name
 # END --------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------

File sal/qa/osl/getsystempathfromfileurl/makefile.mk

View file
 TARGET = qa_osl_getsystempathfromfileurl
 
 ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
 SHL1RPATH = NONE
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
 SHL1TARGET = test-getsystempathfromfileurl
-SHL1VERSIONMAP = version.map
+SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)

File sal/qa/osl/getsystempathfromfileurl/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File sal/qa/osl/module/makefile.mk

View file
 TARGET=qa_module
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB     = i$(SHL1TARGET)
 SHL1DEF        = $(MISC)$/$(SHL1TARGET).def
 DEF1NAME       = $(SHL1TARGET)
-SHL1VERSIONMAP = export_dll.map
+SHL1USE_EXPORTS = name
 
 
 # --- main l ------------------------------------------------------
 SHL2DEF=    $(MISC)$/$(SHL2TARGET).def
 
 DEF2NAME    =$(SHL2TARGET)
-SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS= name
 # END ------------------------------------------------------------------
 
 # --- Targets ------------------------------------------------------

File sal/qa/osl/mutex/makefile.mk

View file
 TARGET=qa_osl_mutex
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1IMPLIB= i$(SHL1TARGET)
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 
 # auto generated Target:Socket

File sal/qa/osl/pipe/makefile.mk

View file
 TARGET=qa_osl_pipe
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 # auto generated Target:Pipe
 # END ------------------------------------------------------------------

File sal/qa/osl/process/makefile.mk

View file
 TARGET=qa_osl_process
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 DEF1NAME    =$(SHL1TARGET)
 
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # END ------------------------------------------------------------------
 

File sal/qa/osl/profile/makefile.mk

View file
 TARGET=qa_osl_profile
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 SHL1RPATH = NONE
 # END ------------------------------------------------------------------
 

File sal/qa/osl/security/makefile.mk

View file
 TARGET=qa_osl_security
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:Security
 # END ------------------------------------------------------------------
 

File sal/qa/osl/setthreadname/makefile.mk

View file
 TARGET = qa_osl_setthreadname
 
 ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
 SHL1RPATH = NONE
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
 SHL1TARGET = test-setthreadname
-SHL1VERSIONMAP = version.map
+SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)

File sal/qa/osl/setthreadname/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File sal/qa/osl/socket/makefile.mk

View file
 TARGET=qa_osl_socket
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 # SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME=    $(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 
 
 SHL3IMPLIB= i$(SHL3TARGET)
 DEF3NAME=    $(SHL3TARGET)
-SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL3USE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 
 SHL4IMPLIB= i$(SHL4TARGET)
 DEF4NAME=    $(SHL4TARGET)
-SHL4VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL4VUSE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 
 SHL5IMPLIB= i$(SHL5TARGET)
 DEF5NAME=    $(SHL5TARGET)
-SHL5VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL5USE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 
 SHL6IMPLIB= i$(SHL6TARGET)
 DEF6NAME=    $(SHL6TARGET)
-SHL6VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL6USE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 
 SHL7IMPLIB= i$(SHL7TARGET)
 DEF7NAME=    $(SHL7TARGET)
-SHL7VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL7USE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 
 SHL8IMPLIB= i$(SHL8TARGET)
 DEF8NAME=    $(SHL8TARGET)
-SHL8VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL8USE_EXPORTS = name
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/alloc/makefile.mk

View file
 TARGET=qa_rtl_alloc
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:jobfile
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/bootstrap/makefile.mk

View file
 TARGET=rtl_bootstrap
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # END ------------------------------------------------------------------
 
 OBJ2FILES=$(OBJ)$/bootstrap_process.obj

File sal/qa/rtl/cipher/makefile.mk

View file
 TARGET=qa_rtl_cipher
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF2EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:joblist
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/crc32/makefile.mk

View file
 TARGET=qa_rtl_crc32
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:jobfile
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/digest/makefile.mk

View file
 TARGET=rtl_digest
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME=    $(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 #------------------------------- All object files -------------------------------
 # do this here, so we get right dependencies

File sal/qa/rtl/doublelock/makefile.mk

View file
 TARGET=qa_rtl_doublelock
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/locale/makefile.mk

View file
 TARGET=qa_rtl_locale
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:locale
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/logfile/makefile.mk

View file
 TARGET=qa_rtl_logfile
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 

File sal/qa/rtl/math/makefile.mk

View file
 TARGET = qa_rtl_profile
 
 ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE: settings.mk
 
 SHL1RPATH = NONE
 SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
 SHL1TARGET = test-rtl-math
-SHL1VERSIONMAP = $(PRJ)/qa/export.map
+SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
 SLOFILES = $(SHL1OBJS)

File sal/qa/rtl/ostring/makefile.mk

View file
 TARGET=qa_rtl_ostring2
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF2EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:joblist
 # END ------------------------------------------------------------------
 
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
-SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS= name
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 
 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

File sal/qa/rtl/oustring/makefile.mk

View file
 TARGET=rtl_oustring2
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:joblist
 # END ------------------------------------------------------------------
 
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
-SHL2VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS= name
 # END ------------------------------------------------------------------
 
 #------------------------------- All object files -------------------------------

File sal/qa/rtl/oustringbuffer/makefile.mk

View file
 TARGET=rtl_oustringbuffer2
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:joblist
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/process/makefile.mk

View file
 TARGET=rtl_Process
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # END ------------------------------------------------------------------
 
 OBJ3FILES=$(OBJ)$/child_process.obj

File sal/qa/rtl/random/makefile.add

-# 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 ------------------------------------------------------------------
-

File sal/qa/rtl/random/makefile.mk

View file
 TARGET=qa_rtl_random
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:job
 # END ------------------------------------------------------------------
 

File sal/qa/rtl/strings/makefile.mk

View file
 TARGET := qa_rtl_strings
 
 ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN := TRUE
 
 .INCLUDE: settings.mk
 
     $(SLO)$/test_oustring_noadditional.obj
 SHL1IMPLIB := i$(SHL1TARGET)
 SHL1STDLIBS := $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP := $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS := name
 DEF1NAME := $(SHL1TARGET)
 
 .INCLUDE: target.mk

File sal/qa/rtl/textenc/makefile.mk

View file
 TARGET=qa_rtl_textenc
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 

File sal/qa/rtl/uri/makefile.mk

View file
 TARGET=qa_rtl_uritest
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 

File sal/qa/rtl/uuid/makefile.mk

View file
 TARGET=rtl_uuid
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 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

File sal/qa/rtl_strings/makefile.mk

View file
 TARGET=qa_rtl_strings
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # auto generated Target:FileBase
 # END ------------------------------------------------------------------
 
 DEF2NAME    =$(SHL2TARGET)
 # DEF2EXPORTFILE= export.exp
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL2USE_EXPORTS = name
 
 # auto generated Target:FileBase
 # END ------------------------------------------------------------------
 
 DEF3NAME    =$(SHL3TARGET)
 # DEF3EXPORTFILE= export.exp
-SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL3USE_EXPORTS = name
 
 # auto generated Target:FileBase
 # END ------------------------------------------------------------------
 
 SHL4IMPLIB= i$(SHL4TARGET)
 DEF4NAME    =$(SHL4TARGET)
-SHL4VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL4USE_EXPORTS = name
 
 # END ------------------------------------------------------------------
 
 
 SHL5IMPLIB= i$(SHL5TARGET)
 DEF5NAME    =$(SHL5TARGET)
-SHL5VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL5USE_EXPORTS = name
 
 # END ------------------------------------------------------------------
 
 
 SHL6IMPLIB= i$(SHL6TARGET)
 DEF6NAME    =$(SHL6TARGET)
-SHL6VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL6USE_EXPORTS = name
 
 # END ------------------------------------------------------------------
 

File sal/qa/systools/makefile.mk

View file
 TARGET=test_comtools
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 DEF1NAME    =$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS= name
 # auto generated Target:joblist
 # END ------------------------------------------------------------------
 

File sal/qa/testHelperFunctions/makefile.mk

View file
 TARGET=qa_testHelperFunctions
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+SHL1USE_EXPORTS = name
 
 # END --------------------------------------------------------------
 

File sax/qa/cppunit/makefile.mk

View file
 TARGET=qa_cppunit
 
 ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
 
 # --- Settings -----------------------------------------------------
 
 # SHL1DEF= $(MISC)/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 # DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= version.map
+SHL1USE_EXPORTS= name
 
 # --- All object files ---------------------------------------------
 

File sax/qa/cppunit/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File sfx2/qa/cppunit/makefile.mk

-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ=../..
-PRJNAME=sfx2
-TARGET=qa_cppunit
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-# --- Libs ---------------------------------------------------------
-
-SHL1OBJS=  \
-	$(SLO)/test_metadatable.obj \
-
-
-SHL1STDLIBS= \
-	 $(CPPUNITLIB) \
-	 $(SALLIB) \
-	 $(CPPULIB) \
-	 $(CPPUHELPERLIB) \
-	 $(VCLLIB) \
-	 $(SFXLIB) \
-
-
-SHL1TARGET= test_metadatable
-SHL1RPATH = NONE
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= version.map
-
-# --- All object files ---------------------------------------------
-
-SLOFILES= \
-	$(SHL1OBJS) \
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END

File sfx2/qa/cppunit/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File smoketestoo_native/makefile.mk

View file
 TARGET = smoketest
 
 ENABLE_EXCEPTIONS = TRUE
+VISIBILITY_HIDDEN = TRUE
 
 ABORT_ON_ASSERTION = TRUE
 
 
 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

File smoketestoo_native/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};

File solenv/gbuild/CppunitTest.mk

View file
 define gb_CppunitTest__CppunitTest_impl
 $(call gb_LinkTarget_LinkTarget,$(2))
 $(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
+ifeq ($(SYSTEM_CPPUNIT),YES)
+$(call gb_LinkTarget_set_defs,$(2), \
+    $$(DEFS) $(gb_Library_DEFS) $(CPPUNIT_CFLAGS))
+$(call gb_LinkTarget_get_target,$(2)) : LDFLAGS += $(CPPUNIT_LIBS)
+else
 $(call gb_LinkTarget_set_defs,$(2),$$(DEFS) $(gb_Library_DEFS))
 $(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
+endif
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
 $(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
 $(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))

File solenv/inc/libs.mk

View file
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
+.IF "$(SYSTEM_CPPUNIT)" == "YES"
+CPPUNITLIB = $(CPPUNIT_LIBS)
+.ELSE
 CPPUNITLIB = icppunit_dll.lib
+.END
 XSLTLIB = libxslt.lib $(LIBXML2LIB)
 .IF "$(GUI)"=="OS2"
 REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib

File stoc/test/uriproc/makefile.mk

View file
 TARGET := test_uriproc
 
 ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN := TRUE
 
 my_components = stocservices
 
 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)

File stoc/test/uriproc/test_uriproc.cxx

View file
  *
  ************************************************************************/
 
-// 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"

File stoc/test/uriproc/version.map

-#*************************************************************************
-#
-# 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:
-        *;
-};