diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-26 22:33:51 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-26 22:43:03 +0100 |
| commit | 9132a8d167f4df2799cd4b6011ff1672eeb7687d (patch) | |
| tree | 87b2f518119bd91fb22a46a5040aef28ee999117 | |
| parent | 5684da4051d891f7c70627c6b43bd6e85ba4c9e5 (diff) | |
gbuild: HelpTarget: delete index files before creating them
... because they are not overwritten, just new ones are created with
different names, which is why i've got a 20 meg en-US.zip here with
about 30 _?.cfs files, all alike.
Change-Id: Ib4d055e1bcfd097dfbbef727a4bcfe2c63d57342
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 06967af660e8..d45ea10ed83c 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -260,8 +260,11 @@ gb_HelpLinkTarget_DEPS := \ $(gb_HelpLinkTarget_IDXCAPTIONTARGET) \ $(gb_HelpLinkTarget_IDXCONTENTTARGET) +# first delete the index stuff since when it is generated an existing _0.cfs +# will not be overwritten; instead a new _1.cfs etc. created until disk is full define gb_HelpLinkTarget__command $(call gb_Output_announce,$(2),$(true),HLK,3) + $(if $(HELP_INDEXED),rm -rf $(addprefix $(HELP_WORKDIR)/,$(HELP_INDEXED)) && \) RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ -lang $(HELP_LANG) \ -mod $(HELP_MODULE) \ @@ -345,9 +348,9 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : $(2) endef -# gb_HelpLinkTarget_set_indexed target +# gb_HelpLinkTarget_set_indexed target indexfiles define gb_HelpLinkTarget_set_indexed -$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(true) +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(2) endef @@ -597,12 +600,8 @@ endef # Add index files into the zip. # # gb_HelpTarget__add_index_files target module -define gb_HelpTarget__add_index_files -$(call gb_HelpTarget__add_file,$(1),$(2).db) -$(call gb_HelpTarget__add_file,$(1),$(2).ht) -$(call gb_HelpTarget__add_file,$(1),$(2).idxl) -$(call gb_HelpTarget__add_file,$(1),$(2).key) - +define gb_HelpTarget__get_index_files +$(foreach suffix,.db .ht .idxl .key,$(addsuffix $(suffix),$(call gb_HelpTarget__get_module,$(1)))) endef # gb_HelpTarget__add_file target file @@ -640,8 +639,8 @@ endef # # gb_HelpTarget_set_indexed target define gb_HelpTarget_set_indexed -$(call gb_HelpLinkTarget_set_indexed,$(1)) -$(call gb_HelpTarget__add_index_files,$(1),$(call gb_HelpTarget__get_module,$(1))) +$(call gb_HelpLinkTarget_set_indexed,$(1),$(call gb_HelpTarget__get_index_files,$(1))) +$(foreach file,$(call gb_HelpTarget__get_index_files,$(1)),$(call gb_HelpTarget__add_file,$(1),$(file))) $(call gb_HelpTarget_get_target,$(1)) : HELP_INDEXED := $(true) |