Skip to content

C
core
Kaydet (Commit) 92b618f5 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

do not copy anything to instdir in build stage 

Change-Id: I923704d47d4fbc764e847a1bd6eed9fca2dce089
üst 423bec3b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
solenv/gbuild/UnoApi.mk
Dosyayı görüntüle @ 92b618f5
...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
gb_UnoApi_DOCDIR := $(gb_Package_SDKDIRNAME)/docs/common/ref 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_INSTALL := $(and $(filter host,$(gb_Side)),$(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
...@@ -30,11 +29,9 @@ $(call gb_UnoApi_get_clean_target,%) : ...@@ -30,11 +29,9 @@ $(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),) ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
$(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
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))
$(call gb_Package_set_outdir,$(1)_doc,$(INSTDIR)) $(call gb_Package_set_outdir,$(1)_doc,$(INSTDIR))
endif endif
...@@ -56,7 +53,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi) ...@@ -56,7 +53,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),UnoApi)
endef endef
ifneq ($(gb_UnoApi_ENABLE_IDL),) ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
# Create a package of IDL files for putting into SDK. # Create a package of IDL files for putting into SDK.
# #
...@@ -72,7 +69,7 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i ...@@ -72,7 +69,7 @@ $(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/i
endef endef
else # !gb_UnoApi_ENABLE_IDL else # !gb_UnoApi_ENABLE_INSTALL
gb_UnoApi_package_idlfiles := gb_UnoApi_package_idlfiles :=
gb_UnoApi__add_idlfile := gb_UnoApi__add_idlfile :=
...@@ -91,7 +88,7 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$ ...@@ -91,7 +88,7 @@ $(call gb_UnoApi__add_headerfile_impl,$(1),$(2),$(subst $() $(),/,$(wordlist 2,$
endef endef
ifneq ($(gb_UnoApi_ENABLE_DOC),) ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
# gb_UnoApi__add_docfile_impl api htmlfile # gb_UnoApi__add_docfile_impl api htmlfile
define gb_UnoApi__add_docfile_impl define gb_UnoApi__add_docfile_impl
...@@ -129,7 +126,7 @@ $(foreach idlfile,$(3),$(call gb_UnoApi__add_docfile_for_idl,$(1),$(2)/$(idlfile ...@@ -129,7 +126,7 @@ $(foreach idlfile,$(3),$(call gb_UnoApi__add_docfile_for_idl,$(1),$(2)/$(idlfile
endef endef
else else # !gb_UnoApi_ENABLE_INSTALL
gb_UnoApi__add_docfile := gb_UnoApi__add_docfile :=
gb_UnoApi__add_docfiles := gb_UnoApi__add_docfiles :=
......
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