README.cross | 30 ++++++++++---------------
cppuhelper/source/shlib.cxx | 12 +++++-----
ios/CustomTarget_LibreOffice_app.mk | 4 +--
ios/experimental/LibreOffice/LibreOffice/lo.mm | 8 +++---
4 files changed, 25 insertions(+), 29 deletions(-)
New commits:
commit 7f7799948e2c29f969413015d6ec45d7777034c2
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed May 1 20:49:24 2013 +0300
Library names have changed thanks to the "layer" changes
Change-Id: I764702510b612da478959f457f95e6040c22f998
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 7b5dcb2..f53a672 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -546,15 +546,15 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
{ "libstocservices.uno.a", stocservices_component_getFactory },
{ "libucpexpand1.uno.a", ucpexpand1_component_getFactory },
#else
- { "configmgr.uno.a", configmgr_component_getFactory },
- { "expwrap.uno.a", expwrap_component_getFactory },
- { "fastsax.uno.a", fastsax_component_getFactory },
- { "i18npool.uno.a", i18npool_component_getFactory },
+ { "libconfigmgrlo.a", configmgr_component_getFactory },
+ { "libexpwraplo.a", expwrap_component_getFactory },
+ { "libfastsaxlo.a", fastsax_component_getFactory },
+ { "libi18npoollo.a", i18npool_component_getFactory },
{ "introspection.uno.a", introspection_component_getFactory },
- { "localebe1.uno.a", localebe1_component_getFactory },
+ { "liblocalebe1lo.a", localebe1_component_getFactory },
{ "reflection.uno.a", reflection_component_getFactory },
{ "stocservices.uno.a", stocservices_component_getFactory },
- { "ucpexpand1.uno.a", ucpexpand1_component_getFactory },
+ { "libucpexpand1lo.a", ucpexpand1_component_getFactory },
#endif
{ "libcomphelper.a", comphelp_component_getFactory },
{ "libdeployment.a", deployment_component_getFactory },
commit d97cf4f14c0245b01756090c3fded4759aeb7cff
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed May 1 20:48:34 2013 +0300
Update names of rdb files and of the fsstorage library
Change-Id: I344d64212aa1d42171f18dae7659ab7f56fecbcb
diff --git a/ios/CustomTarget_LibreOffice_app.mk
b/ios/CustomTarget_LibreOffice_app.mk
index 21a6fac..9092ed9 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -53,9 +53,9 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call
gb_Executable_get_target,LibreOffice)
#
# Copy rdb files
#
- cp $(OUTDIR)/bin/types.rdb $(appdir)
- cp $(OUTDIR)/bin/ure/types.rdb $(appdir)/ure
cp $(OUTDIR)/bin/offapi.rdb $(appdir)
+ cp $(OUTDIR)/bin/udkapi.rdb $(appdir)
+ cp $(OUTDIR)/bin/oovbaapi.rdb $(appdir)
cp $(OUTDIR)/xml/services.rdb $(appdir)
cp $(OUTDIR)/xml/ure/services.rdb $(appdir)/ure
#
diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm
b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index bbd5bce..53c9921 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -74,7 +74,7 @@ lo_get_libmap(void)
{ "libevtattlo.a", evtatt_component_getFactory },
{ "libfileacc.a", fileacc_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
- { "fsstorage.uno.a", fsstorage_component_getFactory },
+ { "libfsstoragelo.a", fsstorage_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
{ "libfwllo.a", fwl_component_getFactory },
{ "libfwmlo.a", fwm_component_getFactory },
@@ -133,13 +133,13 @@ lo_initialize(void)
NSString *uno_types = @"-env:UNO_TYPES=";
uno_types = [uno_types stringByAppendingString: @"file://"];
- uno_types = [uno_types stringByAppendingString: [app_root_escaped
stringByAppendingPathComponent: @"ure/types.rdb"]];
+ uno_types = [uno_types stringByAppendingString: [app_root_escaped
stringByAppendingPathComponent: @"offapi.rdb"]];
uno_types = [uno_types stringByAppendingString: @" file://"];
- uno_types = [uno_types stringByAppendingString: [app_root_escaped
stringByAppendingPathComponent: @"types.rdb"]];
+ uno_types = [uno_types stringByAppendingString: [app_root_escaped
stringByAppendingPathComponent: @"oovbaapi.rdb"]];
uno_types = [uno_types stringByAppendingString: @" file://"];
- uno_types = [uno_types stringByAppendingString: [app_root_escaped
stringByAppendingPathComponent: @"offapi.rdb"]];
+ uno_types = [uno_types stringByAppendingString: [app_root_escaped
stringByAppendingPathComponent: @"udkapi.rdb"]];
assert(strcmp(argv[2], "placeholder-uno-types") == 0);
argv[2] = [uno_types UTF8String];
commit 5011f4cb8d5851921120766b2a7704dec75f400f
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed May 1 20:47:02 2013 +0300
Update to match reality
Change-Id: I37ad1595613f20a8f7c8694b560bb6678c214c62
diff --git a/README.cross b/README.cross
index de4c437..3d962eb 100644
--- a/README.cross
+++ b/README.cross
@@ -31,10 +31,9 @@ below.
Note that in the case of LibreOffice, it is uncommon to run the
configure script directly. Normally one uses the autogen.sh script.
-The autogen.sh script saves its last command-line options used in a
-file called autogen.lastrun. The typical way of working is to edit
-this file, i.e. use it as an input file to autogen.sh and not as a
-saved backup copy of command-line parameters.
+The autogen.sh script reads command-line options from file called
+autogen.lastrun if it exists. The typical way of working is to keep
+the configure parameters in that file and edit it as needed.
What is so hard, then?
@@ -124,7 +123,7 @@ are. It often seems a bit randomish, with copy-pasting
having been
preferred to factoring out differences.
Most of the configuration settings are maintained in the
-distro-configs/LibreOfficeMinGW.conf file, so in your autogen.lastrun,
+distro-configs/LibreOfficeMinGW.conf file, so in your autogen.input,
you can use:
CC=ccache i686-w64-mingw32-gcc
@@ -287,25 +286,22 @@ X. In order to be able to run and debug an app on an
actual device
(and not just the iOS Simulator) you need to be registered in the iOS
Developer Program.
-Here is an autogen.lastrun for iOS (device) using Xcode 4.6, on OS X 10.8:
+Here is an autogen.input for iOS (device) using Xcode 4.6, on OS X 10.8:
-CXX=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-arch armv7 -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk
-miphoneos-version-min=5.0
-CC=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-arch armv7 -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk
-miphoneos-version-min=5.0
+--build=i386-apple-darwin10.7.0
+--host=arm-apple-darwin10
--enable-dbgutil
--enable-debug
--enable-werror
---with-build-platform-configure-options=--with-macosx-sdk=10.7
---with-distro=LibreOfficeiOS
For the iOS Simulator:
-CXX=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
-arch i386 -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk
-mmacosx-version-min=10.7
-CC=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-arch i386 -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk
-mmacosx-version-min=10.7
+--build=i386-apple-darwin10.7.0
+--host=arm-apple-darwin10
+--enable-ios-simulator
--enable-dbgutil
--enable-debug
--enable-werror
---with-build-platform-configure-options=--with-macosx-sdk=10.7
---with-distro=LibreOfficeiOS
Note that you will have to install autoconf and automake yourself
before running autogen.sh. They are no longer included in Xcode 4.3
@@ -349,7 +345,7 @@ Platform Tools, the API 14 SDK Platform and the Android
Support
Library. If you want to run the Android apps in the emulator, you of
course need an appropriate system image for that.
-Here is an autogen.lastrun for Android on ARM when cross-compiling
+Here is an autogen.input for Android on ARM when cross-compiling
from Linux:
--build=x86_64-unknown-linux-gnu
@@ -361,7 +357,7 @@ from Linux:
--with-android-sdk=/home/tml/adt-bundle-linux/sdk
--with-distro=LibreOfficeAndroid
-And here is an autogen.lastrun for Android on X86:
+And here is an autogen.input for Android on X86:
--with-android-ndk=/opt/libreoffice/android-ndk-r8b
--with-android-ndk-toolchain-version=4.6
@@ -419,7 +415,7 @@ _EOF
$ chmod +x pkg-config-wrapper-host
This does not work with pkg-config 0.23. 0.26 is known to work.
-And you are ready to build with autogen.lastrun similar to:
+And you are ready to build with autogen.input similar to:
PKG_CONFIG=<path-to-pkg-config-wrapper-host>
CC=<path-to-arm-linux-gnueabihf-gcc> --sysroot=<path-to-raspbian_rootfs>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
