Kaydet (Commit) cfd5faaf authored tarafından David Tardon's avatar David Tardon

only deliver IDL files if needed

Change-Id: If59a19363d9b82f17fcdfe4632edf6f757c65f64
üst b5ca660e
...@@ -11,6 +11,7 @@ gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref ...@@ -11,6 +11,7 @@ gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref
# NOTE: this is the output dir used in odk/CustomTarget_autodoc.mk # NOTE: this is the output dir used in odk/CustomTarget_autodoc.mk
gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref) gb_UnoApi_SRCDOCDIR := $(call gb_CustomTarget_get_workdir,odk/docs/common/ref)
gb_UnoApi_ENABLE_DOC := $(filter ODK,$(BUILD_TYPE)) gb_UnoApi_ENABLE_DOC := $(filter ODK,$(BUILD_TYPE))
gb_UnoApi_ENABLE_IDL := $(filter ODK,$(BUILD_TYPE))
# NOTE: This is needed temporarily to force rebuild with API files from # NOTE: This is needed temporarily to force rebuild with API files from
# $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl # $(WORKDIR), thus fixing generated deps. Otherwise, a change of an .idl
...@@ -29,8 +30,10 @@ $(call gb_UnoApi_get_clean_target,%) : ...@@ -29,8 +30,10 @@ $(call gb_UnoApi_get_clean_target,%) :
define gb_UnoApi_UnoApi define gb_UnoApi_UnoApi
$(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiTarget_UnoApiTarget,$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
ifneq ($(gb_UnoApi_ENABLE_IDL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) $(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR)) $(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
endif
$(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1)))
ifneq ($(gb_UnoApi_ENABLE_DOC),) ifneq ($(gb_UnoApi_ENABLE_DOC),)
$(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR)) $(call gb_Package_Package_internal,$(1)_doc,$(gb_UnoApi_SRCDOCDIR))
...@@ -45,7 +48,9 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1 ...@@ -45,7 +48,9 @@ $(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_target,$(1
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
$(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1)) $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_UnoApiHeadersTarget_get_clean_target,$(1))
ifneq ($(gb_UnoApi_ENABLE_IDL),)
$(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl) $(call gb_UnoApiTarget_get_headers_target,$(1)) : $(call gb_Package_get_target,$(1)_idl)
endif
$(call gb_UnoApi__make_outdir_headers_rule,$(1)) $(call gb_UnoApi__make_outdir_headers_rule,$(1))
...@@ -56,6 +61,8 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) ...@@ -56,6 +61,8 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
endef endef
ifneq ($(gb_UnoApi_ENABLE_IDL),)
# Create a package of IDL files for putting into SDK. # Create a package of IDL files for putting into SDK.
# #
# gb_UnoApi_package_idlfiles api # gb_UnoApi_package_idlfiles api
...@@ -70,6 +77,13 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i ...@@ -70,6 +77,13 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i
endef endef
else # !gb_UnoApi_ENABLE_IDL
gb_UnoApi_package_idlfiles :=
gb_UnoApi__add_idlfile :=
endif
define gb_UnoApi__add_headerfile_impl define gb_UnoApi__add_headerfile_impl
$(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3)) $(call gb_UnoApiHeadersTarget_add_headerfile,$(1),$(2),$(3))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment