diff options
Diffstat (limited to 'stoc')
30 files changed, 51 insertions, 298 deletions
diff --git a/stoc/prj/build.lst b/stoc/prj/build.lst index 2550563c8c34..1fb7d34eeb32 100644 --- a/stoc/prj/build.lst +++ b/stoc/prj/build.lst @@ -22,3 +22,4 @@ tc stoc\source\javavm nmake - all tc_jvm tc_inc NULL tc stoc\source\javaloader nmake - all tc_jvload tc_inc NULL tc stoc\source\uriproc nmake - all tc_uriproc tc_stserv tc_inc NULL tc stoc\util nmake - all tc_util tc_boot tc_stserv tc_tcv tc_uriproc tc_smgr tc_inc tc_sreg tc_defr tc_ireg tc_regtd tc_tdmng tc_sec NULL +tc stoc\test\uriproc nmake - all tc_test_uriproc tc_util NULL diff --git a/stoc/source/corereflection/corefl.map b/stoc/source/corereflection/corefl.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/source/corereflection/corefl.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk index 1a37f93b4bb4..b61eb13aa9ee 100644 --- a/stoc/source/corereflection/makefile.mk +++ b/stoc/source/corereflection/makefile.mk @@ -55,7 +55,7 @@ NOOPTFILES += $(SLO)$/criface.obj .ENDIF SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = corefl.map +SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ diff --git a/stoc/source/inspect/introspection.map b/stoc/source/inspect/introspection.map deleted file mode 100644 index c2806d230702..000000000000 --- a/stoc/source/inspect/introspection.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3.1 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk index 3a5630d13995..80e87dbf7cab 100644 --- a/stoc/source/inspect/makefile.mk +++ b/stoc/source/inspect/makefile.mk @@ -50,7 +50,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) -SHL1VERSIONMAP = introspection.map +SHL1VERSIONMAP = $(SOLARENV)/src/component.map SHL1RPATH=URELIB SHL1DEPN= diff --git a/stoc/source/invocation/inv.map b/stoc/source/invocation/inv.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/source/invocation/inv.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk index 8e50bfba1285..c170bf6b614e 100644 --- a/stoc/source/invocation/makefile.mk +++ b/stoc/source/invocation/makefile.mk @@ -50,7 +50,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) -SHL1VERSIONMAP = inv.map +SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL1DEPN= SHL1IMPLIB= i$(TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib diff --git a/stoc/source/invocation_adapterfactory/invadp.map b/stoc/source/invocation_adapterfactory/invadp.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/source/invocation_adapterfactory/invadp.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk index 2edb30ea5eb0..66568af039e7 100644 --- a/stoc/source/invocation_adapterfactory/makefile.mk +++ b/stoc/source/invocation_adapterfactory/makefile.mk @@ -50,7 +50,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) -SHL1VERSIONMAP = invadp.map +SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL1RPATH=URELIB SHL1DEPN= diff --git a/stoc/source/javaloader/javaloader.map b/stoc/source/javaloader/javaloader.map deleted file mode 100644 index ac2c3750bfe0..000000000000 --- a/stoc/source/javaloader/javaloader.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk index ef35b6921964..60eea6a23457 100644 --- a/stoc/source/javaloader/makefile.mk +++ b/stoc/source/javaloader/makefile.mk @@ -52,7 +52,7 @@ SHL1STDLIBS=\ $(SALLIB) \ $(JVMACCESSLIB) -SHL1VERSIONMAP = javaloader.map +SHL1VERSIONMAP = $(SOLARENV)/src/component.map SHL1DEPN= SHL1IMPLIB= i$(TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib diff --git a/stoc/source/javavm/jen.map b/stoc/source/javavm/jen.map deleted file mode 100644 index ac2c3750bfe0..000000000000 --- a/stoc/source/javavm/jen.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index 4be9d87f46be..96908d10d1a1 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -54,7 +54,7 @@ SLOFILES= \ $(SLO)$/interact.obj SHL1TARGET= $(TARGET) -SHL1VERSIONMAP = jen.map +SHL1VERSIONMAP = $(SOLARENV)/src/component.map SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk index 00015b35e1f5..424180e114a1 100644 --- a/stoc/source/namingservice/makefile.mk +++ b/stoc/source/namingservice/makefile.mk @@ -50,7 +50,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) -SHL1VERSIONMAP = namingservice.map +SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL1DEPN= SHL1IMPLIB= i$(TARGET) diff --git a/stoc/source/namingservice/namingservice.map b/stoc/source/namingservice/namingservice.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/source/namingservice/namingservice.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk index bcb630cb0073..b38dac146ae1 100644 --- a/stoc/source/proxy_factory/makefile.mk +++ b/stoc/source/proxy_factory/makefile.mk @@ -45,7 +45,7 @@ SLOFILES= \ $(SLO)$/proxyfac.obj SHL1TARGET=$(TARGET) -SHL1VERSIONMAP = proxyfac.map +SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL1STDLIBS= \ $(CPPULIB) \ diff --git a/stoc/source/proxy_factory/proxyfac.map b/stoc/source/proxy_factory/proxyfac.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/source/proxy_factory/proxyfac.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; diff --git a/stoc/test/registry_tdprovider/makefile.mk b/stoc/test/registry_tdprovider/makefile.mk index 0b86669218b5..f258963f9299 100644 --- a/stoc/test/registry_tdprovider/makefile.mk +++ b/stoc/test/registry_tdprovider/makefile.mk @@ -40,16 +40,11 @@ SLOFILES = $(SLO)$/testregistrytdprovider.obj SHL1TARGET = testregistrytdprovider.uno SHL1OBJS = $(SLOFILES) +SHL1VERSIONMAP = $(SOLARENV)/src/component.map SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) SHL1IMPLIB = itestregistrytdprovider DEF1NAME = $(SHL1TARGET) -.IF "$(COMNAME)" == "gcc3" -SHL1VERSIONMAP = testregistrytdprovider.gcc3.map -.ELSE -SHL1VERSIONMAP = testregistrytdprovider.map -.ENDIF - .INCLUDE: target.mk ALLTAR: test diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map b/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map deleted file mode 100644 index 609b64e1e0ca..000000000000 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map +++ /dev/null @@ -1,38 +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: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - _ZN4_STL7num_put*; # STLport - - local: - *; -}; diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.map b/stoc/test/registry_tdprovider/testregistrytdprovider.map deleted file mode 100644 index e4b038369818..000000000000 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.map +++ /dev/null @@ -1,36 +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: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - local: - *; -}; diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk index e3276b19eede..8f39ac552038 100644 --- a/stoc/test/tdmanager/makefile.mk +++ b/stoc/test/tdmanager/makefile.mk @@ -40,16 +40,11 @@ SLOFILES = $(SLO)$/testtdmanager.obj SHL1TARGET = testtdmanager.uno SHL1OBJS = $(SLOFILES) +SHL1VERSIONMAP = $(SOLARENV)/src/component.map SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) SHL1IMPLIB = itesttdmanager DEF1NAME = $(SHL1TARGET) -.IF "$(COMNAME)" == "gcc3" -SHL1VERSIONMAP = testtdmanager.gcc3.map -.ELSE -SHL1VERSIONMAP = testtdmanager.map -.ENDIF - .INCLUDE: target.mk ALLTAR: test diff --git a/stoc/test/tdmanager/testtdmanager.gcc3.map b/stoc/test/tdmanager/testtdmanager.gcc3.map deleted file mode 100644 index 609b64e1e0ca..000000000000 --- a/stoc/test/tdmanager/testtdmanager.gcc3.map +++ /dev/null @@ -1,38 +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: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - _ZN4_STL7num_put*; # STLport - - local: - *; -}; diff --git a/stoc/test/tdmanager/testtdmanager.map b/stoc/test/tdmanager/testtdmanager.map deleted file mode 100644 index e4b038369818..000000000000 --- a/stoc/test/tdmanager/testtdmanager.map +++ /dev/null @@ -1,36 +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: - component_getFactory; - component_getImplementationEnvironment; - component_writeInfo; - - local: - *; -}; diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map index d8c4047c5603..ab5ed357b461 100644 --- a/stoc/test/testsmgr_cpnt.map +++ b/stoc/test/testsmgr_cpnt.map @@ -1,4 +1,4 @@ -UDK_3.1 { +UDK_3_0_0 { global: component_getImplementationEnvironment; component_writeInfo; diff --git a/stoc/test/uriproc/makefile.mk b/stoc/test/uriproc/makefile.mk index d529f8623075..cfdc33e7586b 100644 --- a/stoc/test/uriproc/makefile.mk +++ b/stoc/test/uriproc/makefile.mk @@ -25,7 +25,11 @@ # #************************************************************************* -PRJ := ..$/.. +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ := ../.. PRJNAME := stoc TARGET := test_uriproc @@ -33,27 +37,14 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk +CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files -UNOTYPES = \ - com.sun.star.beans.XPropertySet \ - com.sun.star.lang.XComponent \ - com.sun.star.lang.XMultiComponentFactory \ - com.sun.star.uno.XComponentContext \ - com.sun.star.uri.ExternalUriReferenceTranslator \ - com.sun.star.uri.UriReferenceFactory \ - com.sun.star.uri.VndSunStarPkgUrlReferenceFactory \ - com.sun.star.uri.XExternalUriReferenceTranslator \ - com.sun.star.uri.XUriReference \ - com.sun.star.uri.XUriReferenceFactory \ - com.sun.star.uri.XVndSunStarPkgUrlReferenceFactory \ - com.sun.star.uri.XVndSunStarScriptUrlReference \ - com.sun.star.util.XMacroExpander - SHL1TARGET = $(TARGET) -SHL1OBJS = $(SLO)$/test_uriproc.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB) +SHL1OBJS = $(SLO)/test_uriproc.obj +SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB) SHL1VERSIONMAP = version.map +SHL1RPATH = NONE SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) @@ -61,11 +52,24 @@ SLOFILES = $(SHL1OBJS) .INCLUDE: target.mk +.IF "$(OS)" == "WNT" +my_file = file:/// +.ELSE +my_file = file:// +.END + ALLTAR: test -$(BIN)$/$(TARGET).rdb .ERRREMOVE: - $(COPY) $(SOLARBINDIR)$/types.rdb $@ - regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/stocservices.uno$(DLLPOST)) +test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb + $(CPPUNITTESTER) $(SHL1TARGETN) \ + -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ + -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb \ + -env:OOO_TEST_PREFIX=$(my_file)$(PWD)/$(DLLDEST)/ + +$(MISC)/$(TARGET)/services.rdb: + $(MKDIRHIER) $(@:d) + $(RM) $@ + $(REGCOMP) -register -r $@ -wop=vnd.sun.star.expand:\$${{OOO_TEST_PREFIX}} \ + -c $(DLLDEST)/stocservices.uno$(DLLPOST) -test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).rdb - testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb +.END diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx index 4e46d29644f0..a7ad8d9abf94 100644 --- a/stoc/test/uriproc/test_uriproc.cxx +++ b/stoc/test/uriproc/test_uriproc.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include "com/sun/star/beans/XPropertySet.hpp" #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "com/sun/star/uno/Reference.hxx" @@ -43,10 +42,12 @@ #include "com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.hpp" #include "com/sun/star/uri/XVndSunStarScriptUrlReference.hpp" #include "com/sun/star/util/XMacroExpander.hpp" -#include "cppuhelper/servicefactory.hxx" -#include "testshl/simpleheader.hxx" +#include "cppuhelper/bootstrap.hxx" +#include "cppunit/TestAssert.h" +#include "cppunit/TestFixture.h" +#include "cppunit/extensions/HelperMacros.h" +#include "cppunit/plugin/TestPlugIn.h" #include "osl/diagnose.h" -#include "osl/thread.h" #include "rtl/string.h" #include "rtl/string.hxx" #include "rtl/textenc.h" @@ -148,20 +149,12 @@ private: }; void Test::setUp() { - char const * registry = getForwardString(); - css::uno::Reference< css::lang::XMultiServiceFactory > factory( - cppu::createRegistryServiceFactory( - rtl::OUString( - registry, rtl_str_getLength(registry), - osl_getThreadTextEncoding()))); - //TODO: check for string conversion failure - css::uno::Reference< css::beans::XPropertySet >( - factory, css::uno::UNO_QUERY_THROW)->getPropertyValue( - rtl::OUString::createFromAscii("DefaultContext")) >>= m_context; + m_context = cppu::defaultBootstrap_InitialComponentContext(); m_uriFactory = css::uri::UriReferenceFactory::create(m_context); } void Test::tearDown() { + m_uriFactory.clear(); css::uno::Reference< css::lang::XComponent >( m_context, css::uno::UNO_QUERY_THROW)->dispose(); } @@ -1004,8 +997,8 @@ void Test::testPkgUrlFactory() { } } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/stoc/test/uriproc/version.map b/stoc/test/uriproc/version.map index 7321bbca16ad..3308588ef6f8 100644 --- a/stoc/test/uriproc/version.map +++ b/stoc/test/uriproc/version.map @@ -27,7 +27,7 @@ UDK_3_0_0 { global: - registerAllTestFunction; + cppunitTestPlugIn; local: *; diff --git a/stoc/util/bootstrap.map b/stoc/util/bootstrap.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/util/bootstrap.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk index af2ed92edccb..4243d45511fe 100644 --- a/stoc/util/makefile.mk +++ b/stoc/util/makefile.mk @@ -50,7 +50,7 @@ LIB1FILES= $(SLB)$/bootstrap.lib \ $(SLB)$/regtypeprov.lib \ $(SLB)$/typemgr.lib -SHL1VERSIONMAP = bootstrap.map +SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL1STDLIBS= \ $(CPPULIB) \ @@ -75,7 +75,7 @@ LIB2FILES= \ $(SLB)$/typeconverter.lib \ $(SLB)$/uriproc.lib -SHL2VERSIONMAP = stocservices.map +SHL2VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map SHL2STDLIBS= \ $(CPPULIB) \ diff --git a/stoc/util/stocservices.map b/stoc/util/stocservices.map deleted file mode 100644 index 30c5bb729ac7..000000000000 --- a/stoc/util/stocservices.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - component_canUnload; - local: - *; -}; |