[Libreoffice-commits] .: 2 commits - codemaker/source solenv/gbuild

[Libreoffice Gerrit user]

 codemaker/source/cppumaker/cpputype.cxx |    1 -
 solenv/gbuild/UnoApiTarget.mk           |   23 +++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 06d51d2790b99e31cdcfce366956de35d6ca47d0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Oct 7 08:12:00 2012 +0300

    Revert "For some reason saxparser aborts for me without this"
    
    Not needed now when we always generate comprehensive UDKAPI headers in
    the configuration where I thought the reverted change helped (it
    actually didn't).
    
    This reverts commit 73c3907bce33c07ef78c0bb9ff1e0df8b9fbb323.
    
    Change-Id: Iabbfec9b8e9d6963b31daa52dc574bed01d9eb4c

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 0996db6..eca0143 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -119,7 +119,6 @@ bool isBootstrapType(rtl::OString const & name) {
         "com/sun/star/reflection/XMethodParameter",
         "com/sun/star/reflection/XStructTypeDescription",
         "com/sun/star/reflection/XTypeDescription",
-        "com/sun/star/reflection/XTypeDescriptionEnumeration",
         "com/sun/star/reflection/XTypeDescriptionEnumerationAccess",
         "com/sun/star/reflection/XUnionTypeDescription",
         "com/sun/star/registry/XImplementationRegistration",
commit 922cff776ae913ea3dbd3fdbd6f72fc990bd9260
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Oct 7 08:10:54 2012 +0300

    Let's use only comprehensive UDKAPI headers for Clang on OS X
    
    Change-Id: Ie5969a0f5772676f91c29fe946217d8d31bf514a

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 35c91cf..de6c09d 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -278,9 +278,28 @@ endef
 # harm, by accident or careful design, on platforms where shared
 # libraries are used.)
 
+# We are experimenting with static linking on Android, too. There for
+# technical reasons to get around silly limitations in the OS, sigh.
+
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE
+endif
+
+# It seems that when using the latest Xcode and Clang for OS X, we
+# also neeed to always generate comprehensive headers for
+# udkapi. Otherwise we get assertion failures in saxparser when doing
+# i18npool, at least.
+
+ifeq ($(OS),MACOSX)
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE
+endif
+endif
+
+
 $(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \
 		$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
-	$(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \
+	$(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \
 		$(call gb_Output_announce,$*,$(true),HPB,3) \
 		$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \
 	\
@@ -295,7 +314,7 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \
 
 $(call gb_UnoApiHeadersTarget_get_target,%) : \
 		$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
-	$(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \
+	$(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \
 		$(call gb_Output_announce,$*,$(true),HPP,3) \
 		$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-C), \
 	\