[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/HelpTarget.mk |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit ce5c02e8b16c4bb2e8df75bc7bce80b33696ce30
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 10 19:03:43 2013 +0200

    gbuild: HelpTarget: delete clucene generated files in HelpIndexTarget
    
    9132a8d167f4df2799cd4b6011ff1672eeb7687d wasn't quite right, if the
    HelpLinkTarget is not re-built but the HelpIndexTarget is the
    clucene-generated files need to be deleted by the HelpIndexTarget.
    
    This is all somewhat confusing because some of the index files are
    created by HelpLinker but the ones in .idxl directory are created by
    HelpIndexer.
    
    Change-Id: I0334a2e54e560aead96dcfbab0b088dd4e44924d

diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index f1c1d58..29a15b6 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -280,8 +280,9 @@ 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
+# delete index files here too just to be on the safe side...
+# the index files in the .idxl dir are ceated by HelpIndexer,
+# the ones outside the dir by HelpLinker
 define gb_HelpLinkTarget__command
 $(call gb_Output_announce,$(2),$(true),HLK,3)
 	$(if $(HELP_INDEXED),rm -rf $(addprefix $(HELP_WORKDIR)/,$(HELP_INDEXED)) && \)
@@ -419,11 +420,14 @@ endef
 gb_HelpIndexTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,HelpIndexer)
 gb_HelpIndexTarget_COMMAND := $(call gb_Executable_get_command,HelpIndexer)
 
+# 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_HelpIndexTarget__command
 $(call gb_Output_announce,$*,$(true),HIX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	(\
-		$(gb_HelpIndexTarget_COMMAND) \
+		rm -rf $(HELP_WORKDIR)/$(HELP_MODULE).idxl \
+		&& $(gb_HelpIndexTarget_COMMAND) \
 			-dir $(HELP_WORKDIR) \
 			-lang $(HELP_LANG) \
 			-mod $(HELP_MODULE) \