From 2fbfc1d8f35de91a466be5e3b71549e0696e94ff Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 8 Aug 2012 18:11:34 +0200 Subject: Make ure/source/uretest work again ...at least, Makefile (to be run from within an SDK environment) works again; I reflected all the relevant changes in Makefile.pln (to be run from no specific environment) too, but did not actually check the latter (cherry picked from commit f98379816411f932ccdafede5f9b25c260c17361) Signed-off-by: Michael Stahl Conflicts: ure/source/uretest/version.map Change-Id: Ie2012d26b3bd59335a0f872bbfc1414cc4f5edc5 --- ure/source/uretest/Makefile | 15 ++++------ ure/source/uretest/Makefile.pln | 65 +++++++++++++++++++---------------------- ure/source/uretest/cppmain.cc | 11 +++---- ure/source/uretest/cppserver.cc | 2 +- ure/source/uretest/cpptest.cc | 2 +- ure/source/uretest/version.map | 40 ------------------------- 6 files changed, 42 insertions(+), 93 deletions(-) delete mode 100644 ure/source/uretest/version.map (limited to 'ure') diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index df5f811f01c2..7b5ffa589463 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -116,8 +116,7 @@ clean: $(DELRECURSIVE) $(subst /,$(PS),out.sdk) -out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | \ - out.sdk +out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) | out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \ $(link_std_libs) @@ -129,8 +128,7 @@ out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \ $(CC_DEFINES) $< -out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) version.map | \ - out.sdk +out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) | out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(link_std_libs) @@ -141,8 +139,7 @@ out.sdk/cpptest.$(OBJ_EXT): cpptest.cc out.sdk/cpputypes.cppumaker.flag \ $(CC_DEFINES) $< -out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) \ - version.map | out.sdk +out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) | out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(link_std_libs) @@ -156,11 +153,11 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/cpputypes.cppumaker.flag: | out.sdk $(CPPUMAKER) -O./out.sdk/include/cpputypes \ "-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak" \ - -B/UCR "$(URE_TYPES)" + -BUCR "$(URE_TYPES)" touch $@ out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk - $(CPPUMAKER) -O./out.sdk/include/types -B/UCR $< "-X$(URE_TYPES)" + $(CPPUMAKER) -O./out.sdk/include/types -BUCR $< "-X$(URE_TYPES)" touch $@ @@ -283,7 +280,7 @@ out.sdk/types.mf: types.mf.template | out.sdk out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class - $(DELRECURSIVE) $(subst /,$(PS),out.sdk/class/types) - $(JAVAMAKER) -O./out.sdk/class/types -B/UCR $< "-X$(URE_TYPES)" + $(JAVAMAKER) -O./out.sdk/class/types -BUCR $< "-X$(URE_TYPES)" touch $@ diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index e8ec32056bde..1b900866f1f0 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -88,62 +88,60 @@ clean: rm -rf out.pln -out.pln/cppmain.uno.so: out.pln/cppmain.o version.map | out.pln \ - out.pln/lib/libuno_cppu.so out.pln/lib/libuno_cppuhelpergcc3.so \ - out.pln/lib/libuno_sal.so out.pln/lib/libuno_salhelpergcc3.so \ - out.pln/lib/libstlport_gcc.so - g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings \ - -Wl,--version-script=version.map $< -Lout.pln/lib -luno_cppu \ - -luno_cppuhelpergcc3 -luno_sal -luno_salhelpergcc3 -lstlport_gcc +out.pln/cppmain.uno.so: out.pln/cppmain.o | out.pln out.pln/lib/libuno_cppu.so \ + out.pln/lib/libuno_cppuhelpergcc3.so out.pln/lib/libuno_sal.so \ + out.pln/lib/libuno_salhelpergcc3.so + g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings $< -Lout.pln/lib \ + -luno_cppu -luno_cppuhelpergcc3 -luno_sal -luno_salhelpergcc3 out.pln/cppmain.o: cppmain.cc out.pln/cpputypes.cppumaker.flag \ out.pln/types.cppumaker.flag | out.pln - g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include/stl \ - -I $(SDK_HOME)/include -I out.pln/include/cpputypes \ - -I out.pln/include/types -DCPPU_ENV=gcc3 \ - -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $< + g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \ + -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \ + -I out.pln/include/cpputypes -I out.pln/include/types \ + -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX \ + -DUNX $< -out.pln/cpptest.uno.so: out.pln/cpptest.o version.map | out.pln \ - out.pln/lib/libuno_cppu.so out.pln/lib/libuno_cppuhelpergcc3.so \ - out.pln/lib/libuno_sal.so - g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings \ - -Wl,--version-script=version.map $< -Lout.pln/lib -luno_cppu \ - -luno_cppuhelpergcc3 -luno_sal +out.pln/cpptest.uno.so: out.pln/cpptest.o | out.pln out.pln/lib/libuno_cppu.so \ + out.pln/lib/libuno_cppuhelpergcc3.so out.pln/lib/libuno_sal.so + g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings $< -Lout.pln/lib \ + -luno_cppu -luno_cppuhelpergcc3 -luno_sal out.pln/cpptest.o: cpptest.cc out.pln/cpputypes.cppumaker.flag \ out.pln/types.cppumaker.flag | out.pln - g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include/stl \ - -I $(SDK_HOME)/include -I out.pln/include/cpputypes \ - -I out.pln/include/types -DCPPU_ENV=gcc3 \ - -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $< + g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \ + -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \ + -I out.pln/include/cpputypes -I out.pln/include/types \ + -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX \ + -DUNX $< -out.pln/cppserver.uno.so: out.pln/cppserver.o version.map | out.pln \ +out.pln/cppserver.uno.so: out.pln/cppserver.o | out.pln \ out.pln/lib/libuno_cppu.so out.pln/lib/libuno_cppuhelpergcc3.so \ out.pln/lib/libuno_sal.so - g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings \ - -Wl,--version-script=version.map $< -Lout.pln/lib -luno_cppu \ - -luno_cppuhelpergcc3 -luno_sal + g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings $< -Lout.pln/lib \ + -luno_cppu -luno_cppuhelpergcc3 -luno_sal out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \ out.pln/types.cppumaker.flag | out.pln - g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include/stl \ - -I $(SDK_HOME)/include -I out.pln/include/cpputypes \ - -I out.pln/include/types -DCPPU_ENV=gcc3 \ - -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $< + g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \ + -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \ + -I out.pln/include/cpputypes -I out.pln/include/types \ + -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX \ + -DUNX $< out.pln/cpputypes.cppumaker.flag: | out.pln LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \ -O./out.pln/include/cpputypes \ '-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak' \ - -B/UCR $(URE_HOME)/share/misc/types.rdb + -BUCR $(URE_HOME)/share/misc/types.rdb touch $@ out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \ - -O./out.pln/include/types -B/UCR $< \ + -O./out.pln/include/types -BUCR $< \ -X$(URE_HOME)/share/misc/types.rdb touch $@ @@ -267,7 +265,7 @@ out.pln/types.mf: types.mf.template | out.pln out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class rm -rf out.pln/class/types LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/javamaker \ - -O./out.pln/class/types -B/UCR $< -X$(URE_HOME)/share/misc/types.rdb + -O./out.pln/class/types -BUCR $< -X$(URE_HOME)/share/misc/types.rdb touch $@ @@ -301,9 +299,6 @@ out.pln/lib/libuno_sal.so: | out.pln/lib out.pln/lib/libuno_salhelpergcc3.so: | out.pln/lib ln -fs $(URE_HOME)/lib/libuno_salhelpergcc3.so.3 $@ -out.pln/lib/libstlport_gcc.so: | out.pln/lib - ln -fs $(URE_HOME)/lib/libstlport_gcc.so $@ - out.pln: mkdir $@ diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 816c58ef92ae..b8ad02a7a5d7 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -111,11 +111,8 @@ private: } static char const * const services[] = { "com.sun.star.beans.Introspection", - "com.sun.star.bridge.Bridge", "com.sun.star.bridge.BridgeFactory", - "com.sun.star.bridge.IiopBridge", "com.sun.star.bridge.UnoUrlResolver", - "com.sun.star.bridge.UrpBridge", "com.sun.star.connection.Acceptor", "com.sun.star.connection.Connector", "com.sun.star.io.DataInputStream", @@ -161,10 +158,10 @@ private: static_cast< ::cppu::OWeakObject * >(this)); } for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) { + ::rtl::OUString name(::rtl::OUString::createFromAscii(services[i])); ::css::uno::Reference< ::css::uno::XInterface > instance; try { - instance = manager->createInstanceWithContext( - ::rtl::OUString::createFromAscii(services[i]), context_); + instance = manager->createInstanceWithContext(name, context_); } catch (::css::uno::RuntimeException &) { throw; } catch (::css::uno::Exception &) { @@ -175,7 +172,7 @@ private: } if (!instance.is()) { throw ::css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no instance")), + "no instance: " + name, static_cast< ::cppu::OWeakObject * >(this)); } } @@ -252,7 +249,7 @@ namespace CppMain { } -extern "C" ::sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT ::sal_Bool SAL_CALL component_writeInfo( void * serviceManager, void * registryKey) { return ::cppu::component_writeInfoHelper( diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 960760c3fc1c..03c2bd6c9d24 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -104,7 +104,7 @@ namespace CppServer { } -extern "C" ::sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT ::sal_Bool SAL_CALL component_writeInfo( void * serviceManager, void * registryKey) { return ::cppu::component_writeInfoHelper( diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index e138b8d075eb..b300993a99df 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -104,7 +104,7 @@ cppu::ImplementationEntry entries[] = { } -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * serviceManager, void * registryKey) { return cppu::component_writeInfoHelper( diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map deleted file mode 100644 index 206137092f62..000000000000 --- a/ure/source/uretest/version.map +++ /dev/null @@ -1,40 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -UDK_3_0_0 { - global: - component_getFactory; - component_writeInfo; - - _ZTI*; - _ZTS*; - - _ZN4_STL7num_put*; # for STLport - - local: - *; -}; -- cgit