summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-04-13 08:17:09 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-13 09:26:19 +0200
commit71e52f37ac87256f81c8da1c66e858df0fa6fe8c (patch)
tree476c6a7a1a17d47bd57051fb2baeb05459fc81b5 /cppu
parent6aca2a3d0eac2c01e487e15ba599f8237b9eef61 (diff)
simplify generation of *_allheaders.hxx
There are some differences in the generated headers: cppu_allheaders.hxx now explicitly includes #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/Type.hxx> sal_allheaders.hxx now does not (explicitly) include #include <cppunittester/protectorfactory.hxx> #include <internal/rtllifecycle.h> #include <osl/detail/android-bootstrap.h> #include <osl/detail/component-mapping.h> #include <osl/detail/file.h> #include <osl/detail/ios-bootstrap.h> #include <pch/precompiled_sal.hxx> Change-Id: Ide3c708ac66f23b360b8e130790f8fa8f1911082
Diffstat (limited to 'cppu')
-rw-r--r--cppu/CppunitTest_cppu_checkapi.mk5
-rw-r--r--cppu/CustomTarget_cppu_allheaders.mk18
2 files changed, 5 insertions, 18 deletions
diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk
index c47643aea6c5..bfd4dad5e47a 100644
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -31,11 +31,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_checkapi,\
cppu/qa/checkapi/strings \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_checkapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_checkapi, \
cppu \
udkapi \
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk
index f7573f7e7c38..6959f5f5b104 100644
--- a/cppu/CustomTarget_cppu_allheaders.mk
+++ b/cppu/CustomTarget_cppu_allheaders.mk
@@ -32,21 +32,13 @@ cppu_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppu/allheaders)
$(call gb_CustomTarget_get_target,cppu/allheaders) : \
$(cppu_allheaders_DIR)/cppu_allheaders.hxx
-# dependency on Package_cppu_odk_headers.mk should ensure this is
-# updated whenever a new public header is added
$(cppu_allheaders_DIR)/cppu_allheaders.hxx : \
- $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
- $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \
+ $(call gb_Package_get_target,cppu_odk_headers) \
| $(cppu_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- printf '// Generated list of all cppu/ includes\n' > $@
- $(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \
- $(wildcard $(SRCDIR)/cppu/inc/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*.hxx) \
- $(wildcard $(SRCDIR)/cppu/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*.hxx) \
- $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.hxx), \
- $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \
- printf '#include <%s>\n' $(subst $(SRCDIR)/cppu/inc/,,$(file)) >> $@ && \
- $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
- ) :
+ printf '// Generated list of cppu includes\n' > $@ \
+ $(foreach file,$(shell cat $<),\
+ && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
+ )
# vim: set noet sw=4 ts=4: