diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-21 14:50:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-21 15:51:39 +0100 |
| commit | b2ade3e63e34556cad8157e25f8c75d29e79537d (patch) | |
| tree | 3d268145cc15bedf0d1860c2285ba37c5d62969f /solenv | |
| parent | f504b2de4abd204d87be25ee85ac7b31521757ac (diff) | |
Extract embindmaker from cppumaker into its own tool
...that directly generates one large .cxx
Change-Id: I046539b83f8fde5eda7168c93a8b819137399665
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162343
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApi.mk | 17 | ||||
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_BuildTools.mk | 1 |
3 files changed, 2 insertions, 31 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 9ed314703f33..f396642901fe 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -36,8 +36,6 @@ define gb_UnoApi_add_idlfiles $(call gb_UnoApiTarget_add_idlfiles,$(1),$(2),$(3)) $(call gb_UnoApiHeadersTarget_add_headerfiles,$(1),$(2),$(addsuffix .hpp,$(3))) $(call gb_UnoApiHeadersTarget_add_headerfiles,$(1),$(2),$(addsuffix .hdl,$(3))) -$(if $(filter EMSCRIPTEN, $(OS)),\ - $(call gb_UnoApiHeadersTarget_add_embind,$(1),$(2),$(addsuffix _embind,$(3)))) endef @@ -71,19 +69,4 @@ $(call gb_UnoApiTarget_set_reference_rdbfile,$(1),$(2)) endef -ifeq ($(OS),EMSCRIPTEN) -$(eval $(call gb_StaticLibrary_StaticLibrary,unoembind)) -$(eval $(call gb_StaticLibrary_set_include,unoembind,\ - $$(INCLUDE) \ -)) -$(eval $(call gb_StaticLibrary_use_api,unoembind,\ - offapi \ - udkapi \ -)) -$(eval $(call gb_StaticLibrary_add_exception_objects,unoembind,\ - static/source/unoembindhelpers/PrimaryBindings\ -)) - -endif - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index e4f92eb2d985..6eacbc66a0ab 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -152,7 +152,7 @@ $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,%) : \ $(call gb_Output_announce,$*,$(true),HPC,3) $(call gb_Trace_StartRange,$*,HPC) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*), \ - -C $(if $(filter EMSCRIPTEN, $(OS)), -W)) + -C) $(call gb_Trace_EndRange,$*,HPC) $(call gb_UnoApiHeadersTarget_get_real_target,%) : \ @@ -237,19 +237,6 @@ define gb_UnoApiHeadersTarget_add_headerfiles $(foreach hdr,$(3),$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2)/$(hdr))) endef -# call gb_UnoApiEmbindTarget_add_embind,unoapi,directory,headerfilenames -define gb_UnoApiHeadersTarget_add_embind -$(if $(filter offapi udkapi, $(1)),\ - $(foreach hdr,$(3),$(eval $(call gb_UnoApiEmbindTarget__add_embind,$(1),$(2),$(hdr))))) -endef - -define gb_UnoApiEmbindTarget__add_embind -$(eval $(call gb_StaticLibrary_add_generated_exception_objects,unoembind,\ - UnoApiHeadersTarget/$(1)/comprehensive/$(2)/$(3) \ -)) - -endef - define gb_UnoApiHeadersTarget__use_api_for_target $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : $(call gb_UnoApiTarget_get_target,$(2)) $(call gb_UnoApiHeadersTarget_get_$(3),$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiTarget_get_target,$(2)) diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index c31c809b9993..2522a4e7680c 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -16,6 +16,7 @@ gb_BUILD_TOOLS_executables = \ climaker \ cpp \ cppumaker \ + $(if $(filter EMSCRIPTEN,$(BUILD_TYPE_FOR_HOST)),embindmaker) \ gencoll_rule \ genconv_dict \ gendict \ |