helpcompiler/inc/HelpLinker.hxx | 2 helpcompiler/source/HelpLinker.cxx | 5 + solenv/gbuild/AllLangHelp.mk | 15 +++- solenv/gbuild/HelpTarget.mk | 136 +++++++++++++++++++++---------------- solenv/gbuild/TargetLocations.mk | 6 - 5 files changed, 102 insertions(+), 62 deletions(-)
New commits: commit f27954d5bfb0ad4b69482f26d30a6224aa1f5568 Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 12:26:02 2013 +0100 remove superfluous target Change-Id: I8efd522b6317922f091269b1c857efdb2d05dd56 diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 26ef28b..50961a2 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -295,17 +295,10 @@ $(dir $(call gb_HelpLinkTarget_get_target,%))%/.dir : $(call gb_HelpLinkTarget_get_target,%) : $(gb_HelpLinkTarget_DEPS) $(call gb_HelpLinkTarget__command,$@,$*) -$(call gb_HelpLinkTarget_get_preparation_target,%) : - touch $@ - .PHONY : $(call gb_HelpLinkTarget_get_clean_target,%) $(call gb_HelpLinkTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HLK,3) - $(call gb_Helper_abbreviate_dirs,\ - rm -f \ - $(call gb_HelpLinkTarget_get_target,$*) \ - $(call gb_HelpLinkTarget_get_preparation_target,$*) \ - ) + rm -f $(call gb_HelpLinkTarget_get_target,$*) # Create a help linking target. # @@ -323,9 +316,7 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_SRCDIR := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_TREE := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_WORKDIR := $(4) -$(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_preparation_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(dir $(call gb_HelpLinkTarget_get_target,$(1))).dir -$(call gb_HelpLinkTarget_get_preparation_target,$(1)) :| $(dir $(call gb_HelpLinkTarget_get_preparation_target,$(1))).dir endef @@ -569,7 +560,7 @@ $(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) -$(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) +$(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir $(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) commit 9e3dcc233b3bf3e259e1418c061576d2d0b9f394 Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 12:23:41 2013 +0100 remove superfluous target Change-Id: Idbb67a2cb79f8eb4f8cf5834217bb0c900a978a6 diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 4bc077c..26ef28b 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -534,17 +534,12 @@ $(call gb_HelpTarget_get_linked_target,%) : $(call gb_HelpTarget_get_target,%) : $(call gb_HelpTarget__get_command,$@,$*) -# All processing is done and the results can be packed into a zip. -$(call gb_HelpTarget_get_packing_target,%) : - touch $@ - .PHONY : $(call gb_HelpTarget_get_clean_target,%) $(call gb_HelpTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HLP,4) $(call gb_Helper_abbreviate_dirs,\ rm -rf \ $(call gb_HelpTarget_get_linked_target,$*) \ - $(call gb_HelpTarget_get_packing_target,$*) \ $(call gb_HelpTarget_get_target,$*) \ $(call gb_HelpTarget_get_translation_target,$*) \ $(call gb_HelpTarget_get_workdir,$*) \ @@ -576,11 +571,9 @@ $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) $(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpTarget_get_packing_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_HelpTarget_get_linked_target,$(1)) :| $(dir $(call gb_HelpTarget_get_linked_target,$(1))).dir -$(call gb_HelpTarget_get_packing_target,$(1)) :| $(dir $(call gb_HelpTarget_get_packing_target,$(1))).dir $(call gb_HelpTarget_get_target,$(1)) :| $(dir $(call gb_HelpTarget_get_target,$(1))).dir $(call gb_HelpTarget_get_translation_target,$(1)) :| $(dir $(call gb_HelpTarget_get_translation_target,$(1))).dir @@ -653,7 +646,7 @@ $(call gb_HelpTarget__add_index_files,$(1),$(call gb_HelpTarget__get_module,$(1) $(call gb_HelpTarget_get_target,$(1)) : HELP_INDEXED := $(true) $(call gb_HelpIndexTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpIndexTarget_get_clean_target,$(1)) endef @@ -662,7 +655,7 @@ endef define gb_HelpTarget__add_jar $(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).jar) $(call gb_HelpJarTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpJarTarget_get_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpJarTarget_get_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpJarTarget_get_clean_target,$(1)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 39635e6..b46070e 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -127,7 +127,6 @@ gb_HelpLinkTarget_get_preparation_target = $(WORKDIR)/HelpLinkTarget/$(1).prepar gb_HelpLinkTarget_get_target = $(WORKDIR)/HelpLinkTarget/$(1).done gb_HelpTarget_get_filelist = $(WORKDIR)/HelpTarget/$(1).filelist gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate -gb_HelpTarget_get_packing_target = $(WORKDIR)/HelpTarget/$(1).packing gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1)) gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1) commit b4174e9aaa431c29bab0b613e71d6dab2e725246 Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 12:22:06 2013 +0100 fix typo Change-Id: I348cc52fc90236e5704c0217326d02c2a34c001b diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index bff7e2c..4bc077c 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -399,7 +399,7 @@ gb_HelpIndexTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,HelpInd gb_HelpIndexTarget_COMMAND := $(call gb_Executable_get_command,HelpIndexer) define gb_HelpIndexTarget__command -$(call gb_Output_announce,$*,$(false),HIX,3) +$(call gb_Output_announce,$*,$(true),HIX,3) $(call gb_Helper_abbreviate_dirs,\ (\ $(gb_HelpIndexTarget_COMMAND) \ commit 6df7952fb47944b1cbd1d5b192f96af2d0d399e5 Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 12:15:18 2013 +0100 add missing deps for translations of other modules Change-Id: I13425290fcb19ab373258f79cc9deb9af7fb1d98 diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index bb38eef..bff7e2c 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -383,19 +383,10 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : $(3) endef -# Use help files from another help module for references. -# -# gb_HelpLinkTarget_use_module target help -define gb_HelpLinkTarget_use_module -$(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(2)) - -endef - # Link with help files from another help module. # # gb_HelpLinkTarget_use_linked_module target help define gb_HelpLinkTarget_use_linked_module -$(call gb_HelpLinkTarget_use_module,$(1),$(2)) $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_LINKED_MODULES += $(2) endef @@ -530,11 +521,16 @@ $(dir $(call gb_HelpTarget_get_target,%)).dir : $(dir $(call gb_HelpTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -# Translation of the module's .xhp files is done. Also creates the list -# for gb_HelpTarget_get_filelist. +# Translation of the module's .xhp files and all used modules is done. +# Also creates the list for gb_HelpTarget_get_filelist. $(call gb_HelpTarget_get_translation_target,%) : rm -f $@ && mv $(call var2file,$@.tmp,100,$(HELP_FILES)) $@ +# Translation of the module's .xhp files and all used and linked modules +# is done. +$(call gb_HelpTarget_get_linked_target,%) : + touch $@ + $(call gb_HelpTarget_get_target,%) : $(call gb_HelpTarget__get_command,$@,$*) @@ -547,6 +543,7 @@ $(call gb_HelpTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HLP,4) $(call gb_Helper_abbreviate_dirs,\ rm -rf \ + $(call gb_HelpTarget_get_linked_target,$*) \ $(call gb_HelpTarget_get_packing_target,$*) \ $(call gb_HelpTarget_get_target,$*) \ $(call gb_HelpTarget_get_translation_target,$*) \ @@ -576,11 +573,13 @@ $(call gb_HelpLinkTarget_HelpLinkTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) -$(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) +$(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) +$(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir $(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpTarget_get_packing_target,$(1)) +$(call gb_HelpTarget_get_linked_target,$(1)) :| $(dir $(call gb_HelpTarget_get_linked_target,$(1))).dir $(call gb_HelpTarget_get_packing_target,$(1)) :| $(dir $(call gb_HelpTarget_get_packing_target,$(1))).dir $(call gb_HelpTarget_get_target,$(1)) :| $(dir $(call gb_HelpTarget_get_target,$(1))).dir $(call gb_HelpTarget_get_translation_target,$(1)) :| $(dir $(call gb_HelpTarget_get_translation_target,$(1))).dir @@ -595,7 +594,7 @@ $(call gb_HelpTranslateTarget_HelpTranslateTarget,$(1),$(3)) $(call gb_HelpTreeTarget_HelpTreeTarget,$(1),$(3)) $(call gb_HelpTarget_get_translation_target,$(1)) : $(call gb_HelpTranslateTarget_get_target,$(1)) -$(call gb_HelpTreeTarget_get_target,$(1)) : $(call gb_HelpTranslateTarget_get_target,$(1)) +$(call gb_HelpTreeTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpTranslateTarget_get_clean_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpTreeTarget_get_clean_target,$(1)) @@ -723,7 +722,7 @@ endef # gb_HelpTarget_use_module target module define gb_HelpTarget_use_module -$(call gb_HelpLinkTarget_use_module,$(1),$(2)) +$(call gb_HelpTarget_get_translation_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(2)) endef @@ -736,6 +735,7 @@ endef # gb_HelpTarget_use_linked_module target module define gb_HelpTarget_use_linked_module $(call gb_HelpLinkTarget_use_linked_module,$(1),$(2)) +$(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(2)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 9170769..39635e6 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -126,6 +126,7 @@ gb_HelpJarTarget_get_target = $(WORKDIR)/HelpJarTarget/$(1).done gb_HelpLinkTarget_get_preparation_target = $(WORKDIR)/HelpLinkTarget/$(1).prepare gb_HelpLinkTarget_get_target = $(WORKDIR)/HelpLinkTarget/$(1).done gb_HelpTarget_get_filelist = $(WORKDIR)/HelpTarget/$(1).filelist +gb_HelpTarget_get_linked_target = $(WORKDIR)/HelpTarget/$(1).translate gb_HelpTarget_get_packing_target = $(WORKDIR)/HelpTarget/$(1).packing gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1)) commit 5247c7b0c59a8c65f1d20e62dce71e367c08bea2 Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 11:40:23 2013 +0100 pack help index files correctly Change-Id: I9a6847caa8e8432f500b37e89076594c3728fe2b diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index bf8cf86..2e4599e 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -54,14 +54,14 @@ $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) $(call gb_HelpTarget_set_configdir,$(3),$(gb_AllLangHelp_AUXDIR)) $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) -$(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_zipfile,$(3)) +$(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_target,$(3)) $(call gb_HelpTarget_get_outdir_target,$(4)) :| $(dir $(call gb_HelpTarget_get_outdir_target,$(4))).dir $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_outdir_target,$(4)) $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_target,$(3)) $(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_HelpTarget_get_clean_target,$(3)) $(call gb_AllLangHelp_get_clean_target,$(1)) : HELP_DELIVERABLES += $(call gb_HelpTarget_get_outdir_target,$(4)) -$(call gb_Deliver_add_deliverable,$(call gb_HelpTarget_get_outdir_target,$(4)),$(call gb_HelpTarget_get_zipfile,$(3)),$(1)) +$(call gb_Deliver_add_deliverable,$(call gb_HelpTarget_get_outdir_target,$(4)),$(call gb_HelpTarget_get_target,$(3)),$(1)) endef diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 0c13ee5..bb38eef 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -271,7 +271,7 @@ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ -idxcaption $(gb_HelpLinkTarget_IDXCAPTIONTARGET) \ -idxcontent $(gb_HelpLinkTarget_IDXCONTENTTARGET) \ -sty $(gb_HelpLinkTarget_EMBEDTARGET) \ - $(if $(HELP_CONFIGDIR),-add $(HELP_MODULE).cfg $(HELP_CONFIGDIR)/$(HELP_LANG)/$(HELP_MODULE).cfg) \ + $(if $(and $(HELP_CONFIGDIR),$(HELP_INDEXED)),-add $(HELP_MODULE).cfg $(HELP_CONFIGDIR)/$(HELP_LANG)/$(HELP_MODULE).cfg) \ $(if $(HELP_TREE),-add $(HELP_MODULE).tree $(HELP_TREE)) \ $(foreach file,$(HELP_ADD_FILES),-add $(notdir $(file)) $(file)) \ $(foreach extra,$(HELP_EXTRA_ADD_FILES),-add $(subst :, ,$(extra))) \ @@ -488,6 +488,8 @@ endef gb_HelpTarget_DEFAULT_LANG := en-US +gb_HelpTarget_COMMAND := zip + gb_HelpTarget__get_module = $(patsubst %/$(call gb_HelpTarget__get_lang,$(1)),%,$(1)) gb_HelpTarget__get_lang = $(lastword $(subst /, ,$(1))) gb_HelpTarget__test_default_lang = $(filter $(gb_HelpTarget_DEFAULT_LANG),$(1)) @@ -514,10 +516,12 @@ $(if $(call gb_HelpTarget__is_default_lang,$(1)) \ ) endef -define gb_HelpTarget__make_workdir_rule -$$(call gb_HelpTarget_get_workdir,%)$(2) : - touch $$@ - +define gb_HelpTarget__get_command +$(call gb_Output_announce,$(2),$(true),HLP,4) +cd $(call gb_HelpTarget_get_workdir,$(2)) && \ +$(gb_HelpJarTarget_COMMAND) -q -0 -rX $(1) \ + $(HELP_PACK_FILES) \ + $(if $(and $(HELP_CONFIGDIR),$(HELP_INDEXED)),$(HELP_MODULE).cfg) endef $(dir $(call gb_HelpTarget_get_target,%)).dir : @@ -532,18 +536,12 @@ $(call gb_HelpTarget_get_translation_target,%) : rm -f $@ && mv $(call var2file,$@.tmp,100,$(HELP_FILES)) $@ $(call gb_HelpTarget_get_target,%) : - $(call gb_Output_announce,$*,$(true),HLP,4) - touch $@ + $(call gb_HelpTarget__get_command,$@,$*) # All processing is done and the results can be packed into a zip. $(call gb_HelpTarget_get_packing_target,%) : touch $@ -# make pattern rules for all file types possibly included in a help zip -$(eval $(foreach ext,.css .db .ht .html .idxl/segments.gen .idxl/segments_1 .jar .key,\ - $(call gb_HelpTarget__make_workdir_rule,$(ext)) \ -)) - .PHONY : $(call gb_HelpTarget_get_clean_target,%) $(call gb_HelpTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HLP,4) @@ -559,8 +557,11 @@ $(call gb_HelpTarget_get_clean_target,%) : # # gb_HelpTarget_HelpTarget target module lang define gb_HelpTarget_HelpTarget +$(call gb_HelpTarget_get_target,$(1)) : HELP_CONFIGDIR := $(call gb_HelpTarget_get_target,$(1)) : HELP_MODULE := $(2) +$(call gb_HelpTarget_get_target,$(1)) : HELP_INDEXED := $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3) +$(call gb_HelpTarget_get_target,$(1)) : HELP_PACK_FILES := $(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES := @@ -574,20 +575,17 @@ $(if $(call gb_HelpTarget__test_default_lang,$(3)),,$(call gb_HelpTarget__HelpTa $(call gb_HelpLinkTarget_HelpLinkTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) -$(call gb_Zip_Zip_internal_nodeliver,$(call gb_HelpTarget_get_zipname,$(1)),$(4)) $(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir $(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_Zip_get_target,$(call gb_HelpTarget_get_zipname,$(1))) : $(call gb_HelpTarget_get_packing_target,$(1)) -$(call gb_HelpTarget_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_HelpTarget_get_zipname,$(1))) +$(call gb_HelpTarget_get_target,$(1)) : $(call gb_HelpTarget_get_packing_target,$(1)) $(call gb_HelpTarget_get_packing_target,$(1)) :| $(dir $(call gb_HelpTarget_get_packing_target,$(1))).dir $(call gb_HelpTarget_get_target,$(1)) :| $(dir $(call gb_HelpTarget_get_target,$(1))).dir $(call gb_HelpTarget_get_translation_target,$(1)) :| $(dir $(call gb_HelpTarget_get_translation_target,$(1))).dir $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpLinkTarget_get_clean_target,$(1)) -$(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_HelpTarget_get_zipname,$(1))) endef @@ -610,23 +608,22 @@ endef 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/segments.gen) -$(call gb_HelpTarget__add_file,$(1),$(2).idxl/segments_1) +$(call gb_HelpTarget__add_file,$(1),$(2).idxl) $(call gb_HelpTarget__add_file,$(1),$(2).key) endef # gb_HelpTarget__add_file target file define gb_HelpTarget__add_file -$(call gb_Zip_add_file,$(call gb_HelpTarget_get_zipname,$(1)),$(2)) -$(call gb_HelpTarget_get_workdir,$(1))/$(2) : $(call gb_HelpTarget_get_packing_target,$(1)) +$(call gb_HelpTarget_get_target,$(1)) : HELP_PACK_FILES += $(2) endef # gb_HelpTarget_set_configdir target configdir define gb_HelpTarget_set_configdir $(call gb_HelpLinkTarget_set_configdir,$(1),$(SRCDIR)/$(2)) -$(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).cfg) + +$(call gb_HelpTarget_get_target,$(1)) : HELP_CONFIGDIR := $(SRCDIR)/$(2) endef @@ -654,6 +651,8 @@ 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_HelpTarget_get_target,$(1)) : HELP_INDEXED := $(true) + $(call gb_HelpIndexTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpIndexTarget_get_clean_target,$(1)) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index b4e784a..9170769 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -127,9 +127,7 @@ gb_HelpLinkTarget_get_preparation_target = $(WORKDIR)/HelpLinkTarget/$(1).prepar gb_HelpLinkTarget_get_target = $(WORKDIR)/HelpLinkTarget/$(1).done gb_HelpTarget_get_filelist = $(WORKDIR)/HelpTarget/$(1).filelist gb_HelpTarget_get_packing_target = $(WORKDIR)/HelpTarget/$(1).packing -gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).done -gb_HelpTarget_get_zipfile = $(call gb_Zip_get_target,$(call gb_HelpTarget_get_zipname,$(1))) -gb_HelpTarget_get_zipname = HelpTarget/$(1) +gb_HelpTarget_get_target = $(WORKDIR)/HelpTarget/$(1).zip gb_HelpTarget_get_translation_target = $(call gb_HelpTarget_get_filelist,$(1)) gb_HelpTarget_get_workdir = $(WORKDIR)/HelpTarget/$(1) gb_HelpTranslatePartTarget_get_target = $(WORKDIR)/HelpTranslatePartTarget/$(1)/done commit cfe0fbb039e452ab75552e65474859573cb155fd Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 11:12:53 2013 +0100 do not create index for shared help module Change-Id: I83f9b99abcc952dfea924662a0db8d98efc56307 diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx index ef4f421..b7e8893 100644 --- a/helpcompiler/inc/HelpLinker.hxx +++ b/helpcompiler/inc/HelpLinker.hxx @@ -59,6 +59,7 @@ public: HelpLinker() : m_pIndexerPreProcessor(NULL) , m_bUseLangRoot(true) + , m_bCreateIndex(true) {} ~HelpLinker() { delete m_pIndexerPreProcessor; } @@ -84,6 +85,7 @@ private: fs::path indexDirParentName; IndexerPreProcessor* m_pIndexerPreProcessor; bool m_bUseLangRoot; + bool m_bCreateIndex; void initIndexerPreProcessor(); void link() throw( HelpProcessingException ); void addBookmark( FILE* pFile_DBHelp, std::string thishid, diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 0bdde18..15061f3 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -398,6 +398,9 @@ void HelpLinker::link() throw( HelpProcessingException ) throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); } + if (!m_bCreateIndex) + continue; + std::string documentPath = streamTable.document_path; if (documentPath.find("/") == 0) documentPath = documentPath.substr(1); @@ -736,6 +739,8 @@ void HelpLinker::main( std::vector<std::string> &args, } else if (args[i].compare("-nolangroot") == 0) m_bUseLangRoot = false; + else if (args[i].compare("-noindex") == 0) + m_bCreateIndex = false; else helpFiles.push_back(args[i]); ++i; diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index e547508..bf8cf86 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -155,6 +155,7 @@ endef # gb_AllLangHelp__use_linked_module module other-module lang define gb_AllLangHelp__use_linked_module $(call gb_HelpTarget_use_linked_module,$(call gb_AllLangHelp__get_helpname,$(1),$(3)),$(call gb_AllLangHelp__get_helpname,$(2),$(3))) +$(call gb_HelpTarget_set_indexed,$(call gb_AllLangHelp__get_helpname,$(1),$(3))) endef diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 202961e..0c13ee5 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -262,6 +262,7 @@ $(call gb_Output_announce,$(2),$(true),HLK,3) RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ -lang $(HELP_LANG) \ -mod $(HELP_MODULE) \ + $(if $(HELP_INDEXED),,-noindex) \ -nolangroot \ -o $(WORKDIR)/dummy.zip \ -src $(HELP_SRCDIR) \ @@ -314,6 +315,7 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_ADD_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_FILES := +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_MODULE := $(2) $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_LANG := $(3) $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_LINKED_MODULES := @@ -346,6 +348,12 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : $(2) endef +# gb_HelpLinkTarget_set_indexed target +define gb_HelpLinkTarget_set_indexed +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_INDEXED := $(true) + +endef + # gb_HelpLinkTarget_add_helpfile target helpfile define gb_HelpLinkTarget_add_helpfile $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_FILES += $(2) @@ -568,12 +576,9 @@ $(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4)) $(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4)) $(call gb_Zip_Zip_internal_nodeliver,$(call gb_HelpTarget_get_zipname,$(1)),$(4)) -$(call gb_HelpTarget__add_initial_files,$(1),$(2),$(4)) - $(call gb_HelpLinkTarget_get_preparation_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) $(call gb_HelpLinkTarget_get_target,$(1)) :| $(call gb_HelpTarget_get_workdir,$(1))/.dir -$(call gb_HelpIndexTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) -$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) +$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) $(call gb_Zip_get_target,$(call gb_HelpTarget_get_zipname,$(1))) : $(call gb_HelpTarget_get_packing_target,$(1)) $(call gb_HelpTarget_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_HelpTarget_get_zipname,$(1))) @@ -582,7 +587,6 @@ $(call gb_HelpTarget_get_target,$(1)) :| $(dir $(call gb_HelpTarget_get_target,$ $(call gb_HelpTarget_get_translation_target,$(1)) :| $(dir $(call gb_HelpTarget_get_translation_target,$(1))).dir $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpLinkTarget_get_clean_target,$(1)) -$(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpIndexTarget_get_clean_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_HelpTarget_get_zipname,$(1))) endef @@ -600,10 +604,10 @@ $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpTreeTarget_get_clean endef -# Add always-present files into the zip. +# Add index files into the zip. # -# gb_HelpTarget__add_initial_files target module workdir -define gb_HelpTarget__add_initial_files +# 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/segments.gen) @@ -643,6 +647,19 @@ $(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).tree) endef +# Produce full text search index, bookmark list, etc. +# +# 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_HelpIndexTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_get_target,$(1)) +$(call gb_HelpTarget_get_packing_target,$(1)) : $(call gb_HelpIndexTarget_get_target,$(1)) +$(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpIndexTarget_get_clean_target,$(1)) + +endef + # gb_HelpTarget__add_jar target define gb_HelpTarget__add_jar $(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).jar) commit b12d5e12a60867531974ce6b4eca0ce653bcae7c Author: David Tardon <dtar...@redhat.com> Date: Thu Feb 28 09:33:43 2013 +0100 hack for adding err.html into shared help pack Change-Id: If1cdcb35be2c2eeb1a3d80ddd7b751e0168982d4 diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index dd03395..e547508 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -120,6 +120,16 @@ $(foreach lang,$(gb_AllLangHelp_LANGS),$(call gb_HelpTarget_add_files,$(call gb_ endef +# Add a localized file from helpdir under a new name. +# +# This is a hack needed for err.html in shared help module. +# +# gb_AllLangHelp_add_helpdir_file module filename file +define gb_AllLangHelp_add_helpdir_file +$(foreach lang,$(gb_AllLangHelp_LANGS),$(call gb_HelpTarget_add_helpdir_file,$(call gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2),$(3))) + +endef + # gb_AllLangHelp__use_module module other-module lang define gb_AllLangHelp__use_module $(call gb_HelpTarget_use_module,$(call gb_AllLangHelp__get_helpname,$(1),$(3)),$(call gb_AllLangHelp__get_helpname,$(2),$(3))) diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index ed5b43f..202961e 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -273,6 +273,7 @@ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ $(if $(HELP_CONFIGDIR),-add $(HELP_MODULE).cfg $(HELP_CONFIGDIR)/$(HELP_LANG)/$(HELP_MODULE).cfg) \ $(if $(HELP_TREE),-add $(HELP_MODULE).tree $(HELP_TREE)) \ $(foreach file,$(HELP_ADD_FILES),-add $(notdir $(file)) $(file)) \ + $(foreach extra,$(HELP_EXTRA_ADD_FILES),-add $(subst :, ,$(extra))) \ $(HELP_FILES) \ $(if $(HELP_LINKED_MODULES),\ $(shell cat $(foreach module,$(HELP_LINKED_MODULES),$(call gb_HelpTarget_get_filelist,$(module)))) \ @@ -311,6 +312,7 @@ $(call gb_HelpLinkTarget_get_clean_target,%) : define gb_HelpLinkTarget_HelpLinkTarget $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_ADD_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR := +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_FILES := $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_MODULE := $(2) $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_LANG := $(3) @@ -362,6 +364,17 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : $(2) endef +# Add an arbitrary file to the help pack under a new name. +# +# The file will be added to the root directory of the pack. +# +# gb_HelpLinkTarget_add_renamed_file target filename file +define gb_HelpLinkTarget_add_renamed_file +$(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES += $(strip $(2)):$(strip $(3)) +$(call gb_HelpLinkTarget_get_target,$(1)) : $(3) + +endef + # Use help files from another help module for references. # # gb_HelpLinkTarget_use_module target help @@ -681,6 +694,17 @@ $(foreach file,$(2),$(call gb_HelpTarget_add_file,$(1),$(file))) endef +# Add a localized file from helpdir under a new name. +# +# This is a hack needed for err.html in shared help module. +# +# gb_HelpTarget_add_helpdir_file target filename file +define gb_HelpTarget_add_helpdir_file +$(call gb_HelpLinkTarget_add_renamed_file,$(1),$(2),$(call gb_HelpTarget__get_helpfile,$(1),$(3))) +$(call gb_HelpTarget__add_file,$(1),$(2)) + +endef + # gb_HelpTarget_use_module target module define gb_HelpTarget_use_module $(call gb_HelpLinkTarget_use_module,$(1),$(2)) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits