summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-11-15 15:48:44 +0100
committerMichael Stahl <mstahl@redhat.com>2011-11-15 20:52:00 +0100
commitc506e1852af6605c97b2194df95a0810fd42b3aa (patch)
treefeec5e4c78d9be15d3b899fc8753eaac2d5b11c7
parentd5f0b174d6f85f861d3f0791688ca76c83723234 (diff)
fdo#42865: cppu,cppuhelper,testtools: no mapfile
Instead, build with VISIBILITY_HIDDEN.
-rw-r--r--cppu/qa/cppumaker/makefile.mk3
-rw-r--r--cppu/qa/cppumaker/version.map34
-rw-r--r--cppu/qa/makefile.mk9
-rw-r--r--cppu/qa/version.map34
-rw-r--r--cppuhelper/qa/ifcontainer/export.map7
-rw-r--r--cppuhelper/qa/ifcontainer/makefile.mk3
-rw-r--r--cppuhelper/qa/unourl/export.map7
-rw-r--r--cppuhelper/qa/unourl/makefile.mk3
-rw-r--r--testtools/source/bridgetest/makefile.mk5
9 files changed, 14 insertions, 91 deletions
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
index b0e6f8e0be47..e8f7d7dd4401 100644
--- a/cppu/qa/cppumaker/makefile.mk
+++ b/cppu/qa/cppumaker/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME := cppu
TARGET := test_cppumaker
ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN=TRUE
.INCLUDE: settings.mk
@@ -47,7 +48,7 @@ INCPRE += $(MISC)/$(TARGET)/inc
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)/test_cppumaker.obj
SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
+SHL1USE_EXPORTS = name
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/cppu/qa/cppumaker/version.map b/cppu/qa/cppumaker/version.map
deleted file mode 100644
index 3308588ef6f8..000000000000
--- a/cppu/qa/cppumaker/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/cppu/qa/makefile.mk b/cppu/qa/makefile.mk
index 2dee9913153f..d67184605a20 100644
--- a/cppu/qa/makefile.mk
+++ b/cppu/qa/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME := cppu
TARGET := qa
ENABLE_EXCEPTIONS := TRUE
+VISIBILITY_HIDDEN=TRUE
.INCLUDE: settings.mk
@@ -46,28 +47,28 @@ INCPRE+=$(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET)_any
SHL1OBJS = $(SLO)$/test_any.obj
SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL1VERSIONMAP = version.map
+SHL1USE_EXPORTS = name
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
SHL2TARGET = $(TARGET)_unotype
SHL2OBJS = $(SLO)$/test_unotype.obj
SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL2VERSIONMAP = version.map
+SHL2USE_EXPORTS = name
SHL2IMPLIB = i$(SHL2TARGET)
DEF2NAME = $(SHL2TARGET)
SHL3TARGET = $(TARGET)_reference
SHL3OBJS = $(SLO)$/test_reference.obj
SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL3VERSIONMAP = version.map
+SHL3USE_EXPORTS = name
SHL3IMPLIB = i$(SHL3TARGET)
DEF3NAME = $(SHL3TARGET)
SHL4TARGET = $(TARGET)_recursion
SHL4OBJS = $(SLO)$/test_recursion.obj
SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
-SHL4VERSIONMAP = version.map
+SHL4USE_EXPORTS = name
SHL4IMPLIB = i$(SHL4TARGET)
DEF4NAME = $(SHL4TARGET)
diff --git a/cppu/qa/version.map b/cppu/qa/version.map
deleted file mode 100644
index 3308588ef6f8..000000000000
--- a/cppu/qa/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/cppuhelper/qa/ifcontainer/export.map b/cppuhelper/qa/ifcontainer/export.map
deleted file mode 100644
index 117caf43a63e..000000000000
--- a/cppuhelper/qa/ifcontainer/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/cppuhelper/qa/ifcontainer/makefile.mk b/cppuhelper/qa/ifcontainer/makefile.mk
index d4d67a44ef0e..7d01f53e8e14 100644
--- a/cppuhelper/qa/ifcontainer/makefile.mk
+++ b/cppuhelper/qa/ifcontainer/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME=cppuhelper
TARGET=cppu_ifcontainer
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@ -51,7 +52,7 @@ SHL1STDLIBS=\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP= export.map
+SHL1USE_EXPORTS = name
SLOFILES = $(SHL1OBJS)
diff --git a/cppuhelper/qa/unourl/export.map b/cppuhelper/qa/unourl/export.map
deleted file mode 100644
index 117caf43a63e..000000000000
--- a/cppuhelper/qa/unourl/export.map
+++ /dev/null
@@ -1,7 +0,0 @@
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
diff --git a/cppuhelper/qa/unourl/makefile.mk b/cppuhelper/qa/unourl/makefile.mk
index 35d6e0bdf112..1db7e1190929 100644
--- a/cppuhelper/qa/unourl/makefile.mk
+++ b/cppuhelper/qa/unourl/makefile.mk
@@ -30,6 +30,7 @@ PRJNAME=cppuhelper
TARGET=cppu_unourl
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
# --- Settings -----------------------------------------------------
@@ -51,7 +52,7 @@ SHL1STDLIBS=\
$(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP= export.map
+SHL1USE_EXPORTS = name
SLOFILES = $(SHL1OBJS)
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index 3932d04c9fd0..cc3661a9d75e 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -31,6 +31,7 @@ PRJNAME=testtools
TARGET=bridgetest
USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
LIBTARGET=NO
.INCLUDE: settings.mk
@@ -87,7 +88,7 @@ SHL1STDLIBS= \
SHL1LIBS= $(LIB1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
+SHL1USE_EXPORTS = name
# ---- test object ----
@@ -106,7 +107,7 @@ SHL2STDLIBS= \
SHL2LIBS= $(LIB2TARGET)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
+SHL2USE_EXPORTS = name
SHL3TARGET = constructors.uno
SHL3OBJS = $(SLO)$/constructors.obj