[Libreoffice-commits] .: 8 commits - cppuhelper/prj cppuhelper/source sal/prj sax/test solenv/inc stoc/prj stoc/source store/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Aug 8 11:23:52 PDT 2011
cppuhelper/prj/build.lst | 1 -
cppuhelper/source/shlib.cxx | 26 +++++++++++++++++++++++++-
sal/prj/build.lst | 2 +-
sax/test/makefile.mk | 5 ++++-
solenv/inc/libs.mk | 7 +++++++
stoc/prj/d.lst | 1 +
stoc/source/bootstrap/services.cxx | 6 ++++++
store/prj/d.lst | 3 +--
8 files changed, 45 insertions(+), 6 deletions(-)
New commits:
commit 7d2cea2bc9a9463db8e6b6e82cb8aa9504ba9b8e
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 21:10:30 2011 +0300
More dependent libraries for iOS
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 46d2300..2b85df1 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -318,8 +318,15 @@ XMLREADERLIB=-lxmlreader
# dependencies, recursively. Start from the bottom of the dependency
# stack. This is experimental and obviously incomplete.
+REGLIB+=$(STORELIB)
+
+BOOTSTRAPUNOLIB=$(SOLARLIBDIR)/bootstrap.uno.a
+BOOTSTRAPUNOLIB+=$(SALHELPERLIB) $(REGLIB) $(XMLREADERLIB)
+
SALLIB+=-lsal_textenc
+CPPUHELPERLIB+=$(BOOTSTRAPUNOLIB)
+
UCBHELPERLIB+=$(SALHELPERLIB)
UNOTOOLSLIB+=$(I18NISOLANGLIB)
commit caddae7ba053de19b1a272b8fd63dd87c241f265
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 21:09:36 2011 +0300
Bypass this for non-desktop OSes
diff --git a/sax/test/makefile.mk b/sax/test/makefile.mk
index 7fb7837..c2b2161 100644
--- a/sax/test/makefile.mk
+++ b/sax/test/makefile.mk
@@ -39,7 +39,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+ @echo Nothing done for non-desktop OSes
+.ENDIF
#
# std testcomponent
commit 491dcf9bec8e811ed3abb2f0945661ab0930ea8a
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 21:07:09 2011 +0300
Can't build the iOS static cppuhelper test here now
Since we now link to the (also static) bootstrap.uno component which
hasn't been built yet.
diff --git a/cppuhelper/prj/build.lst b/cppuhelper/prj/build.lst
index 53c704e..570a345 100644
--- a/cppuhelper/prj/build.lst
+++ b/cppuhelper/prj/build.lst
@@ -6,4 +6,3 @@ ch cppuhelper\unotypes nmake - all ch_unotypes NULL
ch cppuhelper\qa\propertysetmixin nmake - all ch_qa_propertysetmixin ch_source NULL
ch cppuhelper\qa\ifcontainer nmake - all ch_qa_ifcontainer ch_source NULL
ch cppuhelper\qa\unourl nmake - all ch_qa_unourl ch_source NULL
-ch cppuhelper\qa\static nmake - all ch_qa_static ch_qa_propertysetmixin ch_qa_ifcontainer ch_qa_unourl NULL
commit 8cd859d9a69a199886355aa8655bb3240536280f
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 21:00:01 2011 +0300
For iOS just link directly to the bootstrap component
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 30c7c1a..8e8fc33 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -441,6 +441,20 @@ Reference< XInterface > invokeComponentFactory(
} // namespace
+#ifdef IOS
+extern "C"
+{
+ // In stoc/source/bootstrap/services.cxx.
+
+ // Sure, some public header would be a better place for this. But
+ // it can't be in some stoc header as that hasn't been built and
+ // delivered yet when cppuhelper is built.
+
+ extern void * bootstrap_component_getFactory(
+ const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+}
+#endif
+
Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
OUString const & rLibName, OUString const & rPath,
OUString const & rImplName,
@@ -483,7 +497,17 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
OUString aExcMsg;
OUString aGetFactoryName = rPrefix + OUSTR(COMPONENT_GETFACTORY);
- oslGenericFunction pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
+
+ oslGenericFunction pSym = NULL;
+
+#ifdef IOS
+ if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION)) )
+ pSym = (oslGenericFunction) bootstrap_component_getFactory;
+#endif
+
+ if ( pSym == NULL )
+ pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
+
if (pSym != 0)
{
xRet = invokeComponentFactory( pSym, lib, aModulePath, rImplName, xMgr, xKey, rPrefix, aExcMsg );
commit c8eefebef629e0c5a87e2230fbd255cca98cc8b6
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 20:58:33 2011 +0300
Use prefixed getFactory and no canUnload on iOS
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index 6a90963..90e04fd 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -120,10 +120,16 @@ static struct ImplementationEntry g_entries[] =
extern "C"
{
+#ifndef IOS
sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( &g_moduleCount , pTime );
}
+#endif
+
+#ifdef IOS
+#define component_getFactory bootstrap_component_getFactory
+#endif
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
commit 9a48e75b07d56f4d91a3cd59c1b94f0db75c9cb3
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 20:56:03 2011 +0300
Deliver also static component archives as built for iOS
diff --git a/stoc/prj/d.lst b/stoc/prj/d.lst
index 35863e7..7490b02 100644
--- a/stoc/prj/d.lst
+++ b/stoc/prj/d.lst
@@ -3,6 +3,7 @@ mkdir: %_DEST%\inc\stoc
..\%__SRC%\bin\*.dll %_DEST%\bin\*
..\%__SRC%\lib\*.so %_DEST%\lib\*
..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.uno.a %_DEST%\lib\*.uno.a
..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
..\%__SRC%\misc\bootstrap.component %_DEST%\xml\bootstrap.component
..\%__SRC%\misc\introspection.component %_DEST%\xml\introspection.component
commit af61542cb87e95076ade78840a5679fa65a3bc95
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 20:52:01 2011 +0300
Deliver also static libstore
diff --git a/store/prj/d.lst b/store/prj/d.lst
index b7809a7..e6bc5fd 100644
--- a/store/prj/d.lst
+++ b/store/prj/d.lst
@@ -6,8 +6,7 @@ mkdir: %_DEST%\inc\store
..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib
..\%__SRC%\lib\libstore.*.* %_DEST%\lib\*
+..\%__SRC%\lib\libstore.a %_DEST%\lib\libstore.a
..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll
-
-
linklib: libstore.*.*
commit 5568dfaacf0e5c37924609776ca73bf8ebba4eb8
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 8 19:24:34 2011 +0300
Add dependencies for sal_qa_static
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 8222001..b67f2d4 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -30,4 +30,4 @@ sa sal\qa\rtl\cipher nmake - all sa_qa_rtl_cipher sa_cppunittester sa_util NULL
sa sal\qa\rtl\doublelock nmake - all sa_qa_rtl_doublelock sa_cppunittester sa_util NULL
sa sal\qa\rtl\locale nmake - all sa_qa_rtl_locale sa_cppunittester sa_util NULL
sa sal\qa\sal nmake - all sa_qa_sal sa_cppunittester sa_util NULL
-sa sal\qa\static nmake - u sal_qa_static sa_qa_sal NULL
+sa sal\qa\static nmake - u sal_qa_static sa_qa_ByteSequence sa_qa_OStringBuffer sa_qa_osl_file.u sa_qa_osl_condition sa_qa_osl_security sa_qa_rt_alloc sa_qa_rtl_crc32 sa_qa_rtl_cipher sa_qa_rtl_doublelock sa_qa_rtl_locale sa_qa_sal NULL
More information about the Libreoffice-commits
mailing list