StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

Browse Source 
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
This commit is contained in:
Ying Wang
2011-11-11 10:52:12 -08:00
parent 4b87f575d4
commit a032d3d073
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/product.mk
View File

@@ -81,7 +81,7 @@ _product_var_list := \
PRODUCT_SDK_ADDON_NAME \ PRODUCT_SDK_ADDON_NAME \
PRODUCT_SDK_ADDON_COPY_FILES \ PRODUCT_SDK_ADDON_COPY_FILES \
PRODUCT_SDK_ADDON_COPY_MODULES \ PRODUCT_SDK_ADDON_COPY_MODULES \
PRODUCT_SDK_ADDON_DOC_MODULE \ PRODUCT_SDK_ADDON_DOC_MODULES \
PRODUCT_DEFAULT_WIFI_CHANNELS \ PRODUCT_DEFAULT_WIFI_CHANNELS \
PRODUCT_DEFAULT_DEV_CERTIFICATE \ PRODUCT_DEFAULT_DEV_CERTIFICATE \

21
core/tasks/sdk-addon.mk
View File

@@ -69,26 +69,21 @@ $(foreach cf,$(files_to_copy), \
$(eval sdk_addon_deps += $(_dest)) \ $(eval sdk_addon_deps += $(_dest)) \
) )
# We don't know about all of the docs files, so depend on the timestamp for # We don't know about all of the docs files, so depend on the timestamps for
# that, and record the directory, and the packaging rule will just copy the # them, and record the directories, and the packaging rule will just copy the
# whole thing. # whole thing.
doc_module := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULE)) doc_modules := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_DOC_MODULES))
ifneq ($(doc_module),) sdk_addon_deps += $(foreach dm, $(doc_modules), $(call doc-timestamp-for, $(dm)))
doc_timestamp := $(call doc-timestamp-for, $(doc_module)) $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules))
sdk_addon_deps += $(doc_timestamp)
$(full_target): PRIVATE_DOCS_DIR := $(OUT_DOCS)/$(doc_module)
else
$(full_target): PRIVATE_DOCS_DIR :=
endif
$(full_target): PRIVATE_STAGING_DIR := $(staging) $(full_target): PRIVATE_STAGING_DIR := $(staging)
$(full_target): $(sdk_addon_deps) | $(ACP) $(full_target): $(sdk_addon_deps) | $(ACP)
@echo Packaging SDK Addon: $@ @echo Packaging SDK Addon: $@
$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs/reference $(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs/reference
$(hide) if [ -n "$(PRIVATE_DOCS_DIR)" ] ; then \ $(hide) for d in $(PRIVATE_DOCS_DIRS); do \
$(ACP) -r $(PRIVATE_DOCS_DIR)/* $(PRIVATE_STAGING_DIR)/docs/reference ;\ $(ACP) -r $$d/* $(PRIVATE_STAGING_DIR)/docs/reference ;\
fi done
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F * ) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F * )