README.cross | 8 ++++++-- cppuhelper/source/defaultbootstrap.cxx | 2 ++ cppuhelper/source/shlib.cxx | 2 ++ ios/qa/sc/filters-test.m | 3 +++ sfx2/source/doc/docmacromode.cxx | 3 ++- 5 files changed, 15 insertions(+), 3 deletions(-)
New commits: commit e7035b865f200ca26f4ba197180a36dd498ca4ee Author: Tor Lillqvist <[email protected]> Date: Mon Jun 4 11:38:51 2012 +0300 Bypass scripting in one more place when DISABLE_SCRIPTING Change-Id: I37ec7fa799e6a8e3162c4dfb2ec92aeccfc57df1 diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 70cd495..3bcbf2d 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -337,6 +337,7 @@ namespace sfx2 sal_Bool DocumentMacroMode::hasMacroLibrary() const { sal_Bool bHasMacroLib = sal_False; +#ifndef DISABLE_SCRIPTING try { Reference< XEmbeddedScripts > xScripts( m_pData->m_rDocumentAccess.getEmbeddedDocumentScripts() ); @@ -408,7 +409,7 @@ namespace sfx2 { DBG_UNHANDLED_EXCEPTION(); } - +#endif return bHasMacroLib; } commit ab4014e602a2eae0143448213579e7dc8ec5d11e Author: Tor Lillqvist <[email protected]> Date: Mon Jun 4 11:19:36 2012 +0300 Must use -mmacosx-version-min=10.6 when host platform is iOS simulator Change-Id: I968ecece624fa7a951699b1958e8c20300ecc78a diff --git a/README.cross b/README.cross index c66e1d4..9923521 100644 --- a/README.cross +++ b/README.cross @@ -282,8 +282,8 @@ it's just a trick to bypass some tests in the configure script. For the iOS simulator, using Xcode 4.3 and clang both for the host and build platform: -CXX=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk -CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk +CXX=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk -mmacosx-version-min=10.6 +CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.1.sdk -mmacosx-version-min=10.6 CC_FOR_BUILD=ccache clang -arch i386 -mmacosx-version-min=10.6 CXX_FOR_BUILD=ccache clang++ -arch i386 -mmacosx-version-min=10.6 --enable-werror @@ -298,6 +298,10 @@ Note that you will have to install autoconf and automake yourself before running autogen.sh. They are no longer included in Xcode 4.3 (not even in the add-on "command line tools"). +The -mmacosx-version-min=10.6 is necessary when building for the iOS +simulator to avoid clang replacing simple calls to fprintf with calls +to fwrite$UNIX2003 which Xcode then warns that doesn't exist on iOS. + Android ------- commit f79d5b911620d3a4b72925684647bc2cec454bff Author: Tor Lillqvist <[email protected]> Date: Mon Jun 4 09:20:19 2012 +0300 Unbreak stuff on iOS a bit after bootstrapping changes Change-Id: I0d2ebfc9aa78a9fed057b853d54797a88218c587 diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index 1f119c9..4edd7a1 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -450,6 +450,7 @@ void Parser::handleComponent() { reader_.getUrl() + ": <component> is missing \"uri\" attribute", css::uno::Reference< css::uno::XInterface >()); } +#ifndef DISABLE_DYNLOADING try { attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_); } catch (const rtl::MalformedUriException & e) { @@ -457,6 +458,7 @@ void Parser::handleComponent() { reader_.getUrl() + ": bad \"uri\" attribute: " + e.getMessage(), css::uno::Reference< css::uno::XInterface >()); } +#endif } void Parser::handleImplementation() { diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 6a5ace5..7d87142 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -541,6 +541,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( // First test library names that aren't app-specific. static lib_to_component_mapping non_app_specific_map[] = { { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory }, + { "bootstrap.uno.a", bootstrap_component_getFactory }, { "configmgr.uno.a", configmgr_component_getFactory }, { "expwrap.uno.a", expwrap_component_getFactory }, { "fastsax.uno.a", fastsax_component_getFactory }, @@ -568,6 +569,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( if ( pSym == NULL) { + // The call the app-specific lo_get_libmap() to get a mapping for the rest const lib_to_component_mapping *map = lo_get_libmap(); for (int i = 0; pSym == NULL && map[i].lib != NULL; ++i) { commit 9c0b624286c1e1148e7bf552704b1a334ebaacfb Author: Tor Lillqvist <[email protected]> Date: Mon Jun 4 09:19:25 2012 +0300 Seems that URE_INTERNAL_LIB_DIR is now mandatory (it's pointless on iOS) Change-Id: I17aa913b8947451e4bf57355a7569769a01ef5b4 diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m index 65db932..8dd142a 100644 --- a/ios/qa/sc/filters-test.m +++ b/ios/qa/sc/filters-test.m @@ -120,6 +120,7 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions "--protector", "dummy-libunobootstrapprotector", "unobootstrapprotector", + "placeholder-ure-internal-lib-dir", "placeholder-uno-types", "placeholder-uno-services" }; @@ -128,6 +129,8 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; + argv[argc-3] = "-env:URE_INTERNAL_LIB_DIR=file:///"; + NSString *uno_types = @"-env:UNO_TYPES="; uno_types = [uno_types stringByAppendingString: @"file://"]; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
