diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-13 08:17:09 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-13 09:26:19 +0200 |
| commit | 71e52f37ac87256f81c8da1c66e858df0fa6fe8c (patch) | |
| tree | 476c6a7a1a17d47bd57051fb2baeb05459fc81b5 /salhelper | |
| parent | 6aca2a3d0eac2c01e487e15ba599f8237b9eef61 (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 'salhelper')
| -rw-r--r-- | salhelper/CppunitTest_salhelper_checkapi.mk | 5 | ||||
| -rw-r--r-- | salhelper/CustomTarget_salhelper_allheaders.mk | 18 |
2 files changed, 5 insertions, 18 deletions
diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk index dd5a08e357d7..3fd31787da7a 100644 --- a/salhelper/CppunitTest_salhelper_checkapi.mk +++ b/salhelper/CppunitTest_salhelper_checkapi.mk @@ -33,11 +33,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,salhelper_checkapi,\ salhelper/qa/checkapi/strings \ )) -$(eval $(call gb_CppunitTest_set_include,salhelper_checkapi,\ - $$(INCLUDE) \ - -I$(SRCDIR)/salhelper/inc \ -)) - # strings.cxx includes generated strings.hxx $(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) : \ INCLUDE += -I$(call gb_CustomTarget_get_workdir,salhelper/allheaders) diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk index fd2e8d076904..0415ccfd4022 100644 --- a/salhelper/CustomTarget_salhelper_allheaders.mk +++ b/salhelper/CustomTarget_salhelper_allheaders.mk @@ -32,21 +32,13 @@ salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allhead $(call gb_CustomTarget_get_target,salhelper/allheaders) : \ $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx -# dependency on Package_salhelper_odk_headers.mk should ensure this is -# updated whenever a new public header is added $(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \ - $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \ - $(SRCDIR)/salhelper/Package_salhelper_odk_headers.mk \ + $(call gb_Package_get_target,salhelper_odk_headers) \ | $(salhelper_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - printf '// Generated list of all salhelper/ includes\n' > $@ - $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \ - $(wildcard $(SRCDIR)/salhelper/inc/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*.hxx) \ - $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.hxx) \ - $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.hxx), \ - $(if $(findstring /win32/, $(file)), printf '#ifdef _WIN32\n' >> $@ &&) \ - printf '#include <%s>\n' $(subst $(SRCDIR)/salhelper/inc/,,$(file)) >> $@ && \ - $(if $(findstring /win32/, $(file)), printf '#endif // _WIN32\n' >> $@ &&) \ - ) : + printf '// Generated list of salhelper includes\n' > $@ \ + $(foreach file,$(shell cat $<),\ + && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \ + ) # vim: set noet sw=4 ts=4: |