[Libreoffice-commits] .: 6 commits - configure.in distro-configs/LibreOfficeiOS.conf i18npool/Executable_i18npool_cppunittester_all.mk i18npool/qa Repository.mk solenv/gbuild
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 23 13:45:49 PDT 2011
Repository.mk | 8 ++++++++
configure.in | 1 +
distro-configs/LibreOfficeiOS.conf | 1 +
i18npool/Executable_i18npool_cppunittester_all.mk | 21 +++++++++++++++++++++
i18npool/qa/cppunit/i18npool_cppunittester_all.cxx | 5 ++++-
solenv/gbuild/platform/ios.mk | 3 ++-
6 files changed, 37 insertions(+), 2 deletions(-)
New commits:
commit 61aff182ab78af4cdd4e3d4d2b5e1b0872cb27f9
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 23 23:43:47 2011 +0300
Make it actually link by adding more libraries
diff --git a/i18npool/Executable_i18npool_cppunittester_all.mk b/i18npool/Executable_i18npool_cppunittester_all.mk
index fe29267..e15117e 100644
--- a/i18npool/Executable_i18npool_cppunittester_all.mk
+++ b/i18npool/Executable_i18npool_cppunittester_all.mk
@@ -46,13 +46,25 @@ $(eval $(call gb_Executable_add_api,i18npool_cppunittester_all,\
))
$(eval $(call gb_Executable_add_linked_libs,i18npool_cppunittester_all,\
+ bootstrap \
cppu \
cppuhelper \
cppunit \
+ gcc3_uno \
+ reg \
sal \
+ salhelper \
+ sal_textenc \
+ store \
+ xmlreader \
$(gb_STDLIBS) \
))
+$(eval $(call gb_Executable_use_externals,i18npool_cppunittester_all, \
+ uikit \
+ foundation \
+))
+
$(eval $(call gb_Executable_add_exception_objects,i18npool_cppunittester_all,\
i18npool/qa/cppunit/i18npool_cppunittester_all \
i18npool/qa/cppunit/test_breakiterator \
commit 8bb70ff45beb79616d6ece65d7ec75505e362bb2
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 23 23:42:38 2011 +0300
Enable linking also with UNO libraries (components)
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index cc03777..7c2e707 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -237,7 +237,8 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
# FIXME framework handling very hackish
define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \
+$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS) $(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \
+$(foreach lib,$(filter $(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT)) \
$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1)))
endef
commit babe8ea45609d42cc2a1496f86b5753165db92b4
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 23 23:41:59 2011 +0300
Add more libraries that we must link with explicitly for iOS
diff --git a/Repository.mk b/Repository.mk
index 6892ecc..38a777e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -164,6 +164,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_others \
mcnttype \
neon \
+ reg \
+ store \
test \
textconv_dict \
xmlsecurity \
@@ -182,6 +184,7 @@ endif
ifeq ($(OS),IOS)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ gcc3_uno \
sal_textenc \
))
endif
@@ -226,6 +229,11 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
writerfilter_debug \
))
+ifeq ($(OS),IOS)
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ bootstrap \
+))
+endif
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
cppu \
commit 5d7d6d4bd4f833e5d01b518c744e91f9f3fa5d13
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 23 22:36:25 2011 +0300
Presumably we want --without-afms
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index fbc60f9..6b1b995 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -15,6 +15,7 @@
--disable-randr
--disable-randr-link
--disable-systray
+--without-afms
--without-fonts
--without-java
--without-junit
commit 65b19ef785965d4635c4bf95c6b3c18b9cdcb9bf
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 23 22:35:33 2011 +0300
No CUPS on iOS
diff --git a/configure.in b/configure.in
index 7673bcd..5e7790f 100755
--- a/configure.in
+++ b/configure.in
@@ -1558,6 +1558,7 @@ darwin*) # Mac OS X or iOS
if test "$host_cpu" = "arm"; then
_os=iOS
test_gtk=no
+ test_cups=no
else
_os=Darwin
fi
commit 9a6fb0f6229896c0fca1e904cb99b70d67c4647f
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 23 17:57:59 2011 +0300
Make it compile
diff --git a/i18npool/Executable_i18npool_cppunittester_all.mk b/i18npool/Executable_i18npool_cppunittester_all.mk
index 3585d63..fe29267 100644
--- a/i18npool/Executable_i18npool_cppunittester_all.mk
+++ b/i18npool/Executable_i18npool_cppunittester_all.mk
@@ -28,6 +28,10 @@
$(eval $(call gb_Executable_Executable,i18npool_cppunittester_all))
+$(eval $(call gb_Executable_add_defs,i18npool_cppunittester_all,\
+ $(gb_OBJCXXFLAGS) \
+))
+
$(eval $(call gb_Executable_add_precompiled_header,i18npool_cppunittester_all,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
$(eval $(call gb_Executable_set_include,i18npool_cppunittester_all,\
@@ -36,6 +40,11 @@ $(eval $(call gb_Executable_set_include,i18npool_cppunittester_all,\
-I$(realpath $(SRCDIR)/i18npool/inc/pch) \
))
+$(eval $(call gb_Executable_add_api,i18npool_cppunittester_all,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,i18npool_cppunittester_all,\
cppu \
cppuhelper \
diff --git a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx
index 6fcead2..3a5d282 100644
--- a/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx
+++ b/i18npool/qa/cppunit/i18npool_cppunittester_all.cxx
@@ -38,10 +38,12 @@
#include "osl/module.h"
#include "osl/module.hxx"
#include "osl/thread.h"
+#include "rtl/bootstrap.hxx"
#include "rtl/process.h"
#include "rtl/string.h"
#include "rtl/string.hxx"
#include "rtl/textcvt.h"
+#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.hxx"
#include "sal/main.h"
#include "sal/types.h"
@@ -134,7 +136,8 @@ SAL_IMPLEMENT_MAIN() {
.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("types.rdb")))
.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")))
.append(sBrandLocation)
- .append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("udkapi.rdb")));
+ .append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("udkapi.rdb")))
+ .toString();
osl_setEnvironment(sTypes.pData, sTypesValue.pData);
TestPlugInSignature plugs[] = {
More information about the Libreoffice-commits
mailing list