[Libreoffice-commits] .: solenv/gbuild

Tor Lillqvist tml at kemper.freedesktop.org
Tue Aug 2 14:24:59 PDT 2011


 solenv/gbuild/Module.mk |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 0707eb0fc0d96e5d99b552323626c36360b596b1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Aug 3 00:24:44 2011 +0300

    Make gb_Module_add_check_target a no-op for iOS

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 85078e8..7ecd947 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -152,11 +152,25 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
+# We don't build normal unit test dynamic libraries (CppUnit
+# "plugins") for iOS, but instead statically linked unit test
+# executables, so make gb_Module_add_check_target a no-op for iOS.
+
+# As such we could build normal "plugins", as dynamic loading of
+# modules presumably does work on iOS, it is just not allowed in apps
+# distributed through the App Store. Unit testing at LO development
+# time obviously is not anything that would be distributed as
+# apps. But let's not, as we have to make this stuff work without
+# dynamic loading anyway if the App Store is an eventual target, and
+# why shouldn't it be.
+
 define gb_Module_add_check_target
+$(if $(filter-out IOS,$(OS)),\
 $(call gb_Module__read_targetfile,$(1),$(2),check target)
 
 $(call gb_Module_get_check_target,$(1)) : $$(gb_Module_CURRENTTARGET)
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
+)
 
 endef
 


More information about the Libreoffice-commits mailing list