From c9904bdd5bf2645c9723a8135c5fbceadb6b9aed Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 5 Dec 2017 12:43:30 +0100 Subject: allow to build only HTML help Change-Id: I4debf079be228e5ce5fae5f1a153f78800407a59 --- Repository.mk | 2 +- config_host.mk.in | 1 + configure.ac | 17 +++++++++++++---- solenv/gbuild/AllLangHelp.mk | 8 ++++++++ solenv/gbuild/HelpTarget.mk | 35 ++++++++++++++++++++++++++++++++++- 5 files changed, 57 insertions(+), 6 deletions(-) diff --git a/Repository.mk b/Repository.mk index 4257bd26b799..f895573b2416 100644 --- a/Repository.mk +++ b/Repository.mk @@ -907,7 +907,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ $(if $(filter $(OS),MACOSX),vcl_osxres) \ xmloff_dtd \ xmlscript_dtd \ - xmlhelp_helpxsl \ + $(if $(ENABLE_HTMLHELP),,xmlhelp_helpxsl) \ $(if $(ENABLE_JAVA),\ scripting_java \ scripting_java_jars \ diff --git a/config_host.mk.in b/config_host.mk.in index 804d18766ad3..2281a90d891c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -134,6 +134,7 @@ export ENABLE_GTK3=@ENABLE_GTK3@ export ENABLE_GTK=@ENABLE_GTK@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@ export ENABLE_HEADLESS=@ENABLE_HEADLESS@ +export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@ export ENABLE_JAVA=@ENABLE_JAVA@ export ENABLE_KDE4=@ENABLE_KDE4@ export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@ diff --git a/configure.ac b/configure.ac index e8d1f6a9bfa7..91437559fbde 100644 --- a/configure.ac +++ b/configure.ac @@ -1863,8 +1863,9 @@ AC_ARG_WITH(help, can be used to bundle only the common part, .e.g help-specific icons. This is useful when you build the helpcontent separately.]) [ - Usage: --with-help build the entire local help + Usage: --with-help build the old local help --without-help no local help (default) + --with-help=html build the new HTML local help --with-help=common bundle common files for the local help but do not build the whole help ], @@ -4594,16 +4595,24 @@ HELP_COMMON_ONLY=FALSE if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Android; then BUILD_TYPE="$BUILD_TYPE HELP" GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES" - if test "$with_help" = "common" ; then + case "$with_help" in + "common") HELP_COMMON_ONLY=TRUE AC_MSG_RESULT([common only]) - else + ;; + "html") + ENABLE_HTMLHELP=TRUE + AC_MSG_RESULT([HTML]) + ;; + *) SCPDEFS="$SCPDEFS -DWITH_HELP" AC_MSG_RESULT([yes]) - fi + ;; + esac else AC_MSG_RESULT([no]) fi +AC_SUBST([ENABLE_HTMLHELP]) AC_SUBST(HELP_COMMON_ONLY) dnl Test whether to include MySpell dictionaries diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index dca6c7090b07..bf1732521cdb 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -25,11 +25,15 @@ $(dir $(call gb_AllLangHelp_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_AllLangHelp_get_target,%) : +ifeq ($(ENABLE_HTMLHELP),) $(call gb_Output_announce,$*,$(true),ALH,5) +endif touch $@ $(call gb_AllLangHelp_get_clean_target,%) : +ifeq ($(ENABLE_HTMLHELP),) $(call gb_Output_announce,$*,$(false),ALH,5) +endif $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_AllLangHelp_get_target,$*) \ ) @@ -40,9 +44,13 @@ $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_target,$(3)) +ifeq ($(ENABLE_HTMLHELP),) $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_HelpTarget_get_packagename,$(3))) +endif $(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_HelpTarget_get_clean_target,$(3)) +ifeq ($(ENABLE_HTMLHELP),) $(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_HelpTarget_get_packagename,$(3))) +endif endef diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index bbcd86d36dcd..58bb552c6694 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -542,7 +542,7 @@ $(if $(call gb_HelpTarget__is_default_lang,$(1)) \ endef define gb_HelpTarget__command -$(call gb_Output_announce,$(2),$(true),HLP,4) +$(if $(ENABLE_HTMLHELP),,$(call gb_Output_announce,$(2),$(true),HLP,4)) touch $@ endef @@ -567,7 +567,9 @@ $(call gb_HelpTarget_get_target,%) : .PHONY : $(call gb_HelpTarget_get_clean_target,%) $(call gb_HelpTarget_get_clean_target,%) : +ifeq ($(ENABLE_HTMLHELP),) $(call gb_Output_announce,$*,$(false),HLP,4) +endif $(call gb_Helper_abbreviate_dirs,\ rm -rf \ $(call gb_HelpTarget_get_linked_target,$*) \ @@ -597,22 +599,29 @@ endef # gb_HelpTarget__HelpTarget_impl target module lang workdir package define gb_HelpTarget__HelpTarget_impl $(if $(call gb_HelpTarget__test_default_lang,$(3)),,$(call gb_HelpTarget__HelpTarget_impl_lang,$(1),$(2),$(3),$(4))) + +ifeq ($(ENABLE_HTMLHELP),) $(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_Package_Package_internal,$(5),$(4)) +endif $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1)) +ifeq ($(ENABLE_HTMLHELP),) $(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)) $(call gb_Package_get_preparation_target,$(5)) : $(call gb_HelpTarget_get_target,$(1)) +endif $(call gb_HelpTarget_get_linked_target,$(1)) :| $(dir $(call gb_HelpTarget_get_linked_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 +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpLinkTarget_get_clean_target,$(1)) +endif endef @@ -656,7 +665,9 @@ endef # gb_HelpTarget__add_file target file define gb_HelpTarget__add_file +ifeq ($(ENABLE_HTMLHELP),) $(call gb_Package_add_file,$(call gb_HelpTarget_get_packagename,$(1)),$(LIBO_SHARE_HELP_FOLDER)/$(call gb_HelpTarget__get_lang,$(1))/$(2),$(2)) +endif endef @@ -666,14 +677,18 @@ endef # # gb_HelpTarget_set_configfile target configfile define gb_HelpTarget_set_configfile +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_set_configfile,$(1),$(SRCDIR)/$(2).cfg) $(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).cfg) +endif endef # gb_HelpTarget_set_helpdir target helpdir define gb_HelpTarget_set_helpdir +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_set_sourcedir,$(1),$(call gb_HelpTarget__get_helpdir,$(1),$(2))) +endif endef @@ -683,8 +698,10 @@ $(if $(call gb_HelpTarget__is_default_lang,$(1)),,\ $(call gb_HelpTreeTarget_set_treefile,$(1),$(2)) \ $(call gb_HelpTreeTarget_set_helptextdir,$(1),$(call gb_HelpTarget__get_helpdir,$(1),$(3))) \ ) +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_set_treefile,$(1),$(call gb_HelpTarget__get_treefile,$(1),$(2))) $(call gb_HelpTarget__add_file,$(1),$(call gb_HelpTarget__get_module,$(1)).tree) +endif endef @@ -692,26 +709,32 @@ endef # # gb_HelpTarget_set_indexed target define gb_HelpTarget_set_indexed +ifeq ($(ENABLE_HTMLHELP),) $(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_HelpIndexTarget_get_target,$(1)) : $(call gb_HelpLinkTarget_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)) +endif endef # gb_HelpTarget__add_jar target define gb_HelpTarget__add_jar +ifeq ($(ENABLE_HTMLHELP),) $(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_target,$(1)) : $(call gb_HelpJarTarget_get_target,$(1)) $(call gb_HelpTarget_get_clean_target,$(1)) : $(call gb_HelpJarTarget_get_clean_target,$(1)) +endif endef define gb_HelpTarget__add_helpfile_impl +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_add_helpfile,$(1),$(2)) +endif $(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES += $(2) @@ -727,7 +750,9 @@ endef define gb_HelpTarget_add_helpfile $(call gb_HelpTranslateTarget_add_file,$(1),$(2)) $(call gb_HelpTarget__add_helpfile,$(1),$(2)) +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpTarget__add_jar,$(1)) +endif endef @@ -735,14 +760,18 @@ endef define gb_HelpTarget_add_helpfiles $(call gb_HelpTranslateTarget_add_files,$(1),$(2)) $(foreach helpfile,$(2),$(call gb_HelpTarget__add_helpfile,$(1),$(helpfile))) +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpTarget__add_jar,$(1)) +endif endef # gb_HelpTarget_add_file target file define gb_HelpTarget_add_file +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_add_file,$(1),$(SRCDIR)/$(2)) $(call gb_HelpTarget__add_file,$(1),$(notdir $(2))) +endif endef @@ -758,8 +787,10 @@ endef # # gb_HelpTarget_add_helpdir_file target filename file define gb_HelpTarget_add_helpdir_file +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_add_renamed_file,$(1),$(2),$(call gb_HelpTarget__get_helpfile,$(1),$(3))) $(call gb_HelpTarget__add_file,$(1),$(2)) +endif endef @@ -777,8 +808,10 @@ endef # gb_HelpTarget_use_linked_module target module define gb_HelpTarget_use_linked_module +ifeq ($(ENABLE_HTMLHELP),) $(call gb_HelpLinkTarget_use_linked_module,$(1),$(2)) $(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(2)) +endif endef -- cgit