[Libreoffice-commits] .: 10 commits - android/qa Library_merged.mk sal/Library_sal.mk sal/Module_sal.mk sal/textenc sc/CppunitTest_sc_filters_test.mk sc/qa solenv/gbuild vcl/source

Tor Lillqvist tml at kemper.freedesktop.org
Wed Feb 15 06:22:55 PST 2012


 Library_merged.mk                              |    6 +++---
 android/qa/desktop/Makefile                    |    7 -------
 android/qa/sc/Makefile                         |    9 +--------
 sal/Library_sal.mk                             |   17 +++++++++++++++++
 sal/Module_sal.mk                              |    3 ++-
 sal/textenc/textenc.cxx                        |    2 +-
 sc/CppunitTest_sc_filters_test.mk              |    3 +++
 sc/qa/unit/helper/qahelper.hxx                 |   21 +++++++++++++++++++++
 solenv/gbuild/extensions/pre_MergedLibsList.mk |    3 +++
 vcl/source/app/svapp.cxx                       |    8 +++++++-
 10 files changed, 58 insertions(+), 21 deletions(-)

New commits:
commit 60323f6bcf75cb80b203ae50f328ca78d035851b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 14 20:09:01 2012 +0200

    When using libmerged there is no "tk" library

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 10d7f63..a0bcc15 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1544,7 +1544,13 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist )
     static sal_Bool bAlreadyTriedToCreate = sal_False;
     if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
     {
-        ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk", sal_True );
+        ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
+#ifdef LIBO_MERGELIBS
+                                                                       "merged",
+#else
+                                                                       "tk",
+#endif
+                                                                       sal_True );
         oslModule hTkLib = osl_loadModuleRelative(
             &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
         if ( hTkLib )
commit 3a2cbe739db31139e03beacd4c886a486acf6922
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 14 13:06:10 2012 +0200

    Add comment wondering why this loadFile() isn't in osl

diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index c679c73..0974e70 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -38,6 +38,12 @@
 
 #include <osl/detail/android-bootstrap.h>
 
+// Why is this here and not in osl, and using the already existing file
+// handling APIs? Do we really want to add arbitrary new file handling
+// wrappers here and there (and then having to handle the Android (and
+// eventually perhaps iOS) special cases here, too)?  Please move this to osl,
+// it sure looks gemerally useful. Or am I missing something?
+
 void loadFile(const rtl::OUString& aFileName, std::string& aContent)
 {
     rtl::OString aOFileName = rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8);
commit 4eaf1feb56632e8e4da34c9a5275bd409395f009
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 14 12:56:43 2012 +0200

    Special-case files in /assets on Android

diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 26bcc7a..32f7d47 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -63,6 +63,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
     utl \
     vcl \
     xo \
+	$(if $(filter $(OS),ANDROID), \
+		lo-bootstrap \
+	) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 4c9ae91..c679c73 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -36,9 +36,24 @@
 #include <string>
 #include <sstream>
 
+#include <osl/detail/android-bootstrap.h>
+
 void loadFile(const rtl::OUString& aFileName, std::string& aContent)
 {
     rtl::OString aOFileName = rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8);
+
+#ifdef ANDROID
+    const char *contents;
+    size_t size;
+    if (strncmp(aOFileName.getStr(), "/assets/", sizeof("/assets/")-1) == 0) {
+        contents = (const char *) lo_apkentry(aOFileName.getStr(), &size);
+        if (contents != 0) {
+            aContent = std::string(contents, size);
+            return;
+        }
+    }
+#endif
+
     std::ifstream aFile(aOFileName.getStr());
 
     rtl::OStringBuffer aErrorMsg("Could not open csv file: ");
commit 888d96f6b48a60abdf9077854f9a5f883f1e84be
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 14 12:39:43 2012 +0200

    Add svt and tk to libmerged

diff --git a/Library_merged.mk b/Library_merged.mk
index 0b2268c..b994231 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,13 +30,13 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
+    i18nutil \
+    jvmfwk \
 	sal \
 	salhelper \
 	sax \
 	sot \
 	svl \
-	svt \
-	tk \
 	tl \
 	ucbhelper \
 	utl \
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 
 $(eval $(call gb_Library_use_externals,merged,\
 	icuuc \
+	jpeg \
 	libxml2 \
 	zlib \
 ))
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index b02ebd0..67fdb7c 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -150,9 +150,7 @@ copy-stuff: buildrcs
 		  stocservices.uno \
 		  store \
 		  svllo \
-		  svtlo \
 		  test \
-		  tklo \
 		  tllo \
 		  ucb1 \
 		  ucbhelper4gcc3 \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 054ba79..71d145b 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -95,10 +95,8 @@ copy-stuff:
 		  stocservices.uno \
 		  store \
 		  svllo \
-		  svtlo \
 		  textinstream.uno \
 		  test \
-		  tklo \
 		  tllo \
 		  ucb1 \
 		  ucbhelper4gcc3 \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cff4b19..a7dfc22 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -47,8 +47,10 @@ gb_MERGEDLIBS := \
 	sfx \
 	sofficeapp \
 	spl \
+	svt \
 	svx \
 	svxcore \
+	tk \
 	uui \
 	xo \
 
commit 8f3cce6f8de919e0cc53b028e49b5587cdece315
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 21:39:33 2012 +0200

    Forgot to drop the merged fw* and sfx libs from here

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c9f4c61..b02ebd0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -120,9 +120,6 @@ copy-stuff: buildrcs
 		  forlo \
 		  foruilo \
 		  freetype \
-		  fwelo \
-		  fwilo \
-		  fwklo \
 		  fsstorage.uno \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
@@ -149,7 +146,6 @@ copy-stuff: buildrcs
 		  saxlo \
 		  sclo \
 		  scfiltlo \
-		  sfxlo \
 		  sotlo \
 		  stocservices.uno \
 		  store \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 0a6a5e8..054ba79 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -67,9 +67,6 @@ copy-stuff:
 		  forlo \
 		  foruilo \
 		  freetype \
-		  fwelo \
-		  fwilo \
-		  fwklo \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
 		  i18npaperlo \
@@ -94,7 +91,6 @@ copy-stuff:
 		  saxlo \
 		  sclo \
 		  scfiltlo \
-		  sfxlo \
 		  sotlo \
 		  stocservices.uno \
 		  store \
commit 7dc908788742c335efef9b9ee168de7979fedb9c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 21:35:57 2012 +0200

    Need libtextinstream.uno

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 22318f0..0a6a5e8 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -100,6 +100,7 @@ copy-stuff:
 		  store \
 		  svllo \
 		  svtlo \
+		  textinstream.uno \
 		  test \
 		  tklo \
 		  tllo \
commit 5f2a2e2149f26db39efd3e7f2fdca952cfcf65f5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 21:34:13 2012 +0200

    Don't bother with a separate libsal_textenc when merging libs

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 6899483..22318f0 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -91,7 +91,6 @@ copy-stuff:
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  sal_textenc \
 		  saxlo \
 		  sclo \
 		  scfiltlo \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index cbdbc82..13a514f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -132,6 +132,23 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/all/filepath \
 ))
 
+ifeq ($(MERGELIBS),TRUE)
+$(eval $(call gb_Library_add_exception_objects,sal,\
+	sal/textenc/context \
+	sal/textenc/convertbig5hkscs \
+	sal/textenc/converteuctw \
+	sal/textenc/convertgb18030 \
+	sal/textenc/convertiso2022cn \
+	sal/textenc/convertiso2022jp \
+	sal/textenc/convertiso2022kr \
+	sal/textenc/convertsinglebytetobmpunicode \
+	sal/textenc/tables \
+	sal/textenc/tcvtbyte \
+	sal/textenc/tcvtmb \
+	sal/textenc/tcvtutf7 \
+))
+endif
+
 ifeq ($(GUI),UNX)
 $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/osl/unx/conditn \
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 42a2124..7a3304a 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,sal,\
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
-	Library_sal_textenc \
+	$(if $(filter TRUE,$(MERGELIBS)),, \
+		Library_sal_textenc) \
 	$(if $(filter $(OS),WNT), \
 		Library_uwinapi) \
 	Package_inc \
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 8d34920..b668492 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData
 
 namespace {
 
-#if defined IOS
+#if defined IOS || defined LIBO_MERGELIBS
 
 extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
     rtl_TextEncoding); // from tables.cxx in sal_textenc library
commit 901b5572b1c03fcb52d0b808e0a1710c2bd51c42
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 20:37:26 2012 +0200

    There is no libvclplug_svplo for Android

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 8afa932..6899483 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -117,7 +117,6 @@ copy-stuff:
 		  utllo \
 		  vbahelperlo \
 		  vcllo \
-		  vclplug_svplo \
 		  xcrlo \
 		  xml2 \
 		  xmlreader \
commit 589450649d790678b4659d07c001c0e59e94ec18
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 20:36:49 2012 +0200

    Need libsal_textenc

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a9425ae..8afa932 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -91,6 +91,7 @@ copy-stuff:
 		  ooxlo \
 		  reflection.uno \
 		  reg \
+		  sal_textenc \
 		  saxlo \
 		  sclo \
 		  scfiltlo \
commit 4347e5d1d8b73178ba6ef3d0cb57f152c9ac94ba
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 13 20:09:38 2012 +0200

    Add sb to libmerged

diff --git a/Library_merged.mk b/Library_merged.mk
index d4e31bb..0b2268c 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	sal \
 	salhelper \
 	sax \
-	sb \
 	sot \
 	svl \
 	svt \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index efe0040..c9f4c61 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -147,7 +147,6 @@ copy-stuff: buildrcs
 		  reflection.uno \
 		  reg \
 		  saxlo \
-		  sblo \
 		  sclo \
 		  scfiltlo \
 		  sfxlo \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a57ecab..a9425ae 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -92,7 +92,6 @@ copy-stuff:
 		  reflection.uno \
 		  reg \
 		  saxlo \
-		  sblo \
 		  sclo \
 		  scfiltlo \
 		  sfxlo \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ebd70a3..cff4b19 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -43,6 +43,7 @@ gb_MERGEDLIBS := \
 	fwm \
 	lng \
 	package2 \
+	sb \
 	sfx \
 	sofficeapp \
 	spl \


More information about the Libreoffice-commits mailing list