[Libreoffice-commits] .: Branch 'feature/calc-multiline-input' - 3 commits - i18npool/qa README.cross

[Kohei Yoshida]

 README.cross                                       |   25 ++++++++++-----------
 i18npool/qa/cppunit/i18npool_cppunittester_all.cxx |   19 ++++++---------
 2 files changed, 20 insertions(+), 24 deletions(-)

New commits:
commit ffe828263462188f0af76eb101935ff0feb395dd
Merge: 1b7c610... 81ad165...
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Wed Sep 7 11:14:33 2011 -0400

    Merge branch 'master' into feature/calc-multiline-input

commit 81ad1652136f48cd3bc7f9de32f506a840d0751e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Aug 28 15:36:26 2011 +0300

    Get the file: URIs right

diff --git a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx
index 3a5d282..f56002f 100644
--- a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx
+++ b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx
@@ -43,6 +43,7 @@
 #include "rtl/string.h"
 #include "rtl/string.hxx"
 #include "rtl/textcvt.h"
+#include "rtl/uri.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/main.h"
@@ -124,20 +125,16 @@ SAL_IMPLEMENT_MAIN() {
     rtl::OUString sServices(RTL_CONSTASCII_USTRINGPARAM("UNO_SERVICES"));
     rtl::OUString sTypes(RTL_CONSTASCII_USTRINGPARAM("UNO_TYPES"));
 
-    rtl::OUString sBrandLocation(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/"));
+    rtl::OUString base;
+    osl::Module::getUrlFromAddress((oslGenericFunction)sal_main, base);
 
-    rtl::Bootstrap::expandMacros(sBrandLocation);
-
-    rtl::OUString sServicesValue = rtl::OUStringBuffer(sBrandLocation)
-        . append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("services.rdb"))).makeStringAndClear();
+    rtl::OUString sServicesValue = rtl::Uri::convertRelToAbs(base, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("services.rdb")));
     osl_setEnvironment(sServices.pData, sServicesValue.pData);
 
-    rtl::OUString sTypesValue = rtl::OUStringBuffer(sBrandLocation)
-        .append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("types.rdb")))
-        .append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")))
-        .append(sBrandLocation)
-        .append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("udkapi.rdb")))
-        .toString();
+    rtl::OUString sTypesValue =
+        rtl::Uri::convertRelToAbs(base, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("types.rdb")))
+        + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))
+        + rtl::Uri::convertRelToAbs(base, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("udkapi.rdb")));
     osl_setEnvironment(sTypes.pData, sTypesValue.pData);
 
     TestPlugInSignature plugs[] = {
commit 7974c4f08a231bdcec5f0a29a929c2a539eb95ec
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Aug 28 11:14:47 2011 +0300

    Updates

diff --git a/README.cross b/README.cross
index 8241ea7..87044e4 100644
--- a/README.cross
+++ b/README.cross
@@ -5,6 +5,12 @@ Notes on cross-compiling LibreOffice, originally written by Tor
 Lillqvist <tlillqvist at novell.com> <tml at iki.fi> in May, 2011, for later
 history see git log.
 
+My cross-compilation experimentation is going on for four platforms:
+Windows, iOS, Android and PowerPC Mac OS X. I work on the master
+branch of LibreOffice. Some other people have talked about setting up
+a separate branch for Android work, or even separate clones at
+github. I am not interested in that.
+
 Cross-compilation of LibreOffice completely is not possible yet. Much
 work has been done, "baby steps" for some platforms, much more for
 others, but a lot remains. For iOS and Android this work is highly
@@ -16,12 +22,6 @@ Searching for information about cross-compilation of OpenOffice.org
 (the predecessor of LibreOffice) you will find information about what
 actually was not cross-compilation, but using QEMU.
 
-My cross-compilation experimentation is going on for four platforms:
-Windows, iOS, Android and PowerPC Mac OS X. I work on the master
-branch of LibreOffice. Some other people have talked about setting up
-a separate branch for Android work, or even separate clones at
-github. I am not interested in that.
-
 
 General
 -------
@@ -64,12 +64,11 @@ Windows
 -------
 
 There is some support in LibreOffice already (from OpenOffice.org) for
-building it locally on Windows but with the GNU tool-chain, i.e. what
-is commonly known as MinGW. But as far as I know, that work has never
-attempted cross-compilation.
+building it locally on Windows with the GNU tool-chain (MinGW). But as
+far as I know, that work has never attempted cross-compilation.
 
 This OOo-originated MinGW support attempts to support both running
-Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler.  The
+Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler. The
 -mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if
 it isn't already, and I have not attempted to try to keep it working;
 in fact I have activly cleaned out mechanisms related to this. Ditto
@@ -89,7 +88,7 @@ Build Service, running on openSUSE:
 
 http://download.opensuse.org/repositories/windows:/mingw:/win32/
 
-[You can install it like:
+You can install it on openSUSE like this:
 
 zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/windows:mingw:win32.repo
 zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \
@@ -112,11 +111,11 @@ tells you, and either remove one of the --with-system-*, or install the
 missing dependency.
 
 It also looks like graphite2.pc needs tweaking in order to work right; but
-that's likely to be fixed in the openSUSE project.]
+that's likely to be fixed in the openSUSE project.
 
 It is somewhat unclear how well thought-out the conditionals and code
 for MinGW inside the OOo-originated code in LibreOffice actually
-is. The little I have seen of it seems a bit randomish, with
+are. What I have noticed of it seems a bit randomish, with
 copy-pasting having been preferred to factoring out differences.
 
 The autogen.lastrun I use for my MinGW cross-compilation experimentation is: