[Libreoffice-commits] .: 3 commits - cppuhelper/qa cppuhelper/source sal/osl

[Tor Lillqvist]

 cppuhelper/qa/propertysetmixin/makefile.mk |    2 +-
 cppuhelper/qa/static/makefile.mk           |    6 ++++++
 cppuhelper/source/shlib.cxx                |   11 +++++++++++
 sal/osl/unx/module.c                       |    5 +++--
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit a90f6b270c4570c001dc3c6bec2e2a43a665b2e5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 1 21:10:14 2011 +0300

    Try to use the app executable module on iOS for now

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index a979454..8acfb33 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -354,6 +354,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
     OUString const & rPrefix )
     SAL_THROW( (loader::CannotActivateFactoryException) )
 {
+#ifndef IOS
     OUString aModulePath( makeComponentPath( rLibName, rPath ) );
     if (! checkAccessPath( &aModulePath ))
     {
@@ -371,6 +372,16 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
             OUSTR("loading component library failed: ") + aModulePath,
             Reference< XInterface >() );
     }
+#else
+    oslModule lib;
+    OUString aModulePath(OUSTR("MAIN"));
+    if (! osl_getModuleHandle( NULL, &lib))
+    {
+        throw loader::CannotActivateFactoryException(
+            OUSTR("osl_getModuleHandle of the executable: "),
+            Reference< XInterface >() );
+    }
+#endif
 
     Reference< XInterface > xRet;
 
commit fc87095321c08d1ee1845586cae101660843e9ca
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 1 21:09:09 2011 +0300

    We do want to use RTLD_DEFAULT and dlsym() also on iOS

diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c
index a5beea9..fefb313 100644
--- a/sal/osl/unx/module.c
+++ b/sal/osl/unx/module.c
@@ -112,7 +112,7 @@ sal_Bool SAL_CALL
 osl_getModuleHandle(rtl_uString *pModuleName, oslModule *pResult)
 {
     (void) pModuleName; /* avoid warning about unused parameter */
-#ifndef NO_DL_FUNCTIONS
+#if !defined(NO_DL_FUNCTIONS) || defined(IOS)
     *pResult = (oslModule) RTLD_DEFAULT;
 #else
     *pResult = NULL;
@@ -161,7 +161,8 @@ osl_getAsciiFunctionSymbol(oslModule Module, const sal_Char *pSymbol)
 {
     void *fcnAddr = NULL;
     
-#ifndef NO_DL_FUNCTIONS
+/* We do want to use dlsym on iOS */
+#if !defined(NO_DL_FUNCTIONS) || defined(IOS)
     if (pSymbol)
     {
         fcnAddr = dlsym(Module, pSymbol);
commit 5a82fce495a1fd806d3a76699aaac61327c77346
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 1 21:05:58 2011 +0300

    Nah, these must be subsequent tests also for iOS

diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index 6f43fc7..da794db 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == "" && "$(OS)" != "IOS"
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
 nothing .PHONY:
 .ELSE
 
diff --git a/cppuhelper/qa/static/makefile.mk b/cppuhelper/qa/static/makefile.mk
index b9c5e2d..1eb7d1f 100644
--- a/cppuhelper/qa/static/makefile.mk
+++ b/cppuhelper/qa/static/makefile.mk
@@ -25,6 +25,10 @@
 #
 #***********************************************************************/
 
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
+
 PRJ = ../..
 PRJNAME = cppuhelper
 TARGET = cppuhelper_cppunittester_all
@@ -57,3 +61,5 @@ APP1STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
 APP1TARGET = $(TARGET)
 
 .INCLUDE: target.mk
+
+.ENDIF