diff options
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/source/startup.sh | 13 | ||||
| -rw-r--r-- | ure/source/uretest/Makefile | 8 | ||||
| -rw-r--r-- | ure/source/uretest/Makefile.pln | 4 | ||||
| -rw-r--r-- | ure/source/uretest/cppmain.cc | 31 |
4 files changed, 23 insertions, 33 deletions
diff --git a/ure/source/startup.sh b/ure/source/startup.sh index 7130d172809b..1b80e16cf3d6 100644 --- a/ure/source/startup.sh +++ b/ure/source/startup.sh @@ -39,8 +39,17 @@ epath=`dirname "$0"` if [ -x "${epath}/javaldx" ] ; then jpath=`"${epath}/javaldx" $my_envargs` if [ -n "${jpath}" ]; then - LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - export LD_LIBRARY_PATH + sd_platform=`uname -s` + case $sd_platform in + AIX) + LIBPAT=${jpath}${LIBPATH:+:${LIBPATH}} + export LIBPATH + ;; + *) + LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + export LD_LIBRARY_PATH + ;; + esac fi fi diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index 7aaf580eb642..df5f811f01c2 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -57,13 +57,13 @@ endif .PHONY: ALL -ALL: test +ALL: check include $(PRJ)/settings/stdtarget.mk -.PHONY: test -test: test-cpptest test-javatest test-javanative test-clientserver +.PHONY: check +check: test-cpptest test-javatest test-javanative test-clientserver .PHONY: test-cpptest test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \ @@ -120,7 +120,7 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | \ out.sdk $(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \ $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \ - $(STLPORTLIB) $(link_std_libs) + $(link_std_libs) out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/types.cppumaker.flag | out.sdk diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index d5062a56810d..e8ec32056bde 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -40,8 +40,8 @@ GXX_INCLUDE_PATH ?= /usr/include/g++ .DELETE_ON_ERROR: -.PHONY: test -test: test-regview test-cpptest test-javatest test-javanative test-clientserver +.PHONY: check +check: test-regview test-cpptest test-javatest test-javanative test-clientserver .PHONY: test-regview test-regview: out.pln/services.rdb diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 0be81b637053..307ffaef29e4 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -26,12 +26,13 @@ ************************************************************************/ #include "sal/config.h" +#include "sal/macros.h" #include <cstddef> #include <functional> #include <memory> #include <new> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "com/sun/star/lang/XMain.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" @@ -104,9 +105,9 @@ private: { // check for stlport osl::Mutex m; std::auto_ptr< cppu::OMultiTypeInterfaceContainerHelperVar< - int, std::hash< int >, std::equal_to< int > > > dummy( + int, boost::hash< int >, std::equal_to< int > > > dummy( new cppu::OMultiTypeInterfaceContainerHelperVar< - int, std::hash< int >, std::equal_to< int > >(m)); + int, boost::hash< int >, std::equal_to< int > >(m)); } static char const * const services[] = { "com.sun.star.beans.Introspection", @@ -151,26 +152,6 @@ private: "com.sun.star.uri.UriReferenceFactory", "com.sun.star.uri.UriSchemeParser_vndDOTsunDOTstarDOTscript", "com.sun.star.uri.VndSunStarPkgUrlReferenceFactory" - // "com.sun.star.beans.PropertyBag", - // "com.sun.star.beans.PropertySet", - // "com.sun.star.bridge.OleApplicationRegistration", - // "com.sun.star.bridge.OleBridgeSupplier", - // "com.sun.star.bridge.OleBridgeSupplier2", - // "com.sun.star.bridge.OleBridgeSupplierVar1", - // "com.sun.star.bridge.OleObjectFactory", - // "com.sun.star.bridge.oleautomation.ApplicationRegistration", - // "com.sun.star.bridge.oleautomation.BridgeSupplier", - // "com.sun.star.bridge.oleautomation.Factory", - // "com.sun.star.loader.Dynamic", - // "com.sun.star.registry.DefaultRegistry", - // "com.sun.star.script.AllListenerAdapter", - // "com.sun.star.script.Engine", - // "com.sun.star.script.JavaScript", - // "com.sun.star.test.TestFactory", - // "com.sun.star.util.BootstrapMacroExpander", - // "com.sun.star.util.MacroExpander", - // "com.sun.star.util.logging.Logger", - // "com.sun.star.util.logging.LoggerRemote" }; ::css::uno::Reference< ::css::lang::XMultiComponentFactory > manager( context_->getServiceManager()); @@ -179,7 +160,7 @@ private: ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no service manager")), static_cast< ::cppu::OWeakObject * >(this)); } - for (::std::size_t i = 0; i < sizeof services / sizeof services[0]; ++i) { + for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) { ::css::uno::Reference< ::css::uno::XInterface > instance; try { instance = manager->createInstanceWithContext( @@ -200,7 +181,7 @@ private: } static char const * const singletons[] = { "com.sun.star.util.theMacroExpander" }; - for (::std::size_t i = 0; i < sizeof singletons / sizeof singletons[0]; ++i) + for (::std::size_t i = 0; i < SAL_N_ELEMENTS(singletons); ++i) { ::rtl::OUStringBuffer b; b.appendAscii(RTL_CONSTASCII_STRINGPARAM("/singletons/")); |