From 6a39aed4a3bec2ef053371eff3199f6de1f46874 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 14 Nov 2018 13:58:40 +0100 Subject: Database files should appear with app:"BASE" in instdir/help/*/bookmarks.js ...instead of with app:"SHARED", according to a request by buovjaga. That means that helpcontent2/source/text/shared/explorer/database/*.xhp files (and their per-locale counterparts) should be processed into workdir/ CustomTarget/helpcontent2/help3xsl/shared/explorer/database/*/bookmarks.part (which were empty until now) instead of workdir/CustomTarget/helpcontent2/help3xsl/shared/*/bookmarks.part. This change requres gb_AllLangHelp_*_BOOKMARK_HELPFILES introduced into the core repo with "Prepare gb_AllLangHelp_add_helpfiles for special bookmark needs". Change-Id: I8f37fcec67a37aee4260042e550214a34495254a Reviewed-on: https://gerrit.libreoffice.org/63365 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- AllLangHelp_shared.mk | 165 +++++++++++++++++++++++++------------------------- CustomTarget_html.mk | 2 +- 2 files changed, 85 insertions(+), 82 deletions(-) diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 29faac068c..6d87868efe 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -592,87 +592,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/autopi/01170300 \ helpcontent2/source/text/shared/autopi/01170400 \ helpcontent2/source/text/shared/autopi/01170500 \ - helpcontent2/source/text/shared/explorer/database/02000000 \ - helpcontent2/source/text/shared/explorer/database/02000002 \ - helpcontent2/source/text/shared/explorer/database/02010100 \ - helpcontent2/source/text/shared/explorer/database/02010101 \ - helpcontent2/source/text/shared/explorer/database/04000000 \ - helpcontent2/source/text/shared/explorer/database/04030000 \ - helpcontent2/source/text/shared/explorer/database/05000000 \ - helpcontent2/source/text/shared/explorer/database/05000001 \ - helpcontent2/source/text/shared/explorer/database/05000003 \ - helpcontent2/source/text/shared/explorer/database/05010000 \ - helpcontent2/source/text/shared/explorer/database/05010100 \ - helpcontent2/source/text/shared/explorer/database/05020000 \ - helpcontent2/source/text/shared/explorer/database/05020100 \ - helpcontent2/source/text/shared/explorer/database/05030000 \ - helpcontent2/source/text/shared/explorer/database/05030100 \ - helpcontent2/source/text/shared/explorer/database/05030200 \ - helpcontent2/source/text/shared/explorer/database/05030300 \ - helpcontent2/source/text/shared/explorer/database/05030400 \ - helpcontent2/source/text/shared/explorer/database/05040000 \ - helpcontent2/source/text/shared/explorer/database/05040100 \ - helpcontent2/source/text/shared/explorer/database/05040200 \ - helpcontent2/source/text/shared/explorer/database/11000002 \ - helpcontent2/source/text/shared/explorer/database/11020000 \ - helpcontent2/source/text/shared/explorer/database/11030000 \ - helpcontent2/source/text/shared/explorer/database/11030100 \ - helpcontent2/source/text/shared/explorer/database/11080000 \ - helpcontent2/source/text/shared/explorer/database/11090000 \ - helpcontent2/source/text/shared/explorer/database/dabaadvprop \ - helpcontent2/source/text/shared/explorer/database/dabaadvpropdat \ - helpcontent2/source/text/shared/explorer/database/dabaadvpropgen \ - helpcontent2/source/text/shared/explorer/database/dabadoc \ - helpcontent2/source/text/shared/explorer/database/dabaprop \ - helpcontent2/source/text/shared/explorer/database/dabapropadd \ - helpcontent2/source/text/shared/explorer/database/dabapropcon \ - helpcontent2/source/text/shared/explorer/database/dabapropgen \ - helpcontent2/source/text/shared/explorer/database/dabawiz00 \ - helpcontent2/source/text/shared/explorer/database/dabawiz01 \ - helpcontent2/source/text/shared/explorer/database/dabawiz02 \ - helpcontent2/source/text/shared/explorer/database/dabawiz02access \ - helpcontent2/source/text/shared/explorer/database/dabawiz02ado \ - helpcontent2/source/text/shared/explorer/database/dabawiz02dbase \ - helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc \ - helpcontent2/source/text/shared/explorer/database/dabawiz02ldap \ - helpcontent2/source/text/shared/explorer/database/dabawiz02mysql \ - helpcontent2/source/text/shared/explorer/database/dabawiz02odbc \ - helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \ - helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \ - helpcontent2/source/text/shared/explorer/database/dabawiz02text \ - helpcontent2/source/text/shared/explorer/database/dabawiz03auth \ - helpcontent2/source/text/shared/explorer/database/main \ - helpcontent2/source/text/shared/explorer/database/menubar \ - helpcontent2/source/text/shared/explorer/database/menuedit \ - helpcontent2/source/text/shared/explorer/database/menufile \ - helpcontent2/source/text/shared/explorer/database/menufilesave \ - helpcontent2/source/text/shared/explorer/database/menuinsert \ - helpcontent2/source/text/shared/explorer/database/menutools \ - helpcontent2/source/text/shared/explorer/database/menuview \ - helpcontent2/source/text/shared/explorer/database/migrate_macros \ - helpcontent2/source/text/shared/explorer/database/password \ - helpcontent2/source/text/shared/explorer/database/querywizard00 \ - helpcontent2/source/text/shared/explorer/database/querywizard01 \ - helpcontent2/source/text/shared/explorer/database/querywizard02 \ - helpcontent2/source/text/shared/explorer/database/querywizard03 \ - helpcontent2/source/text/shared/explorer/database/querywizard04 \ - helpcontent2/source/text/shared/explorer/database/querywizard05 \ - helpcontent2/source/text/shared/explorer/database/querywizard06 \ - helpcontent2/source/text/shared/explorer/database/querywizard07 \ - helpcontent2/source/text/shared/explorer/database/querywizard08 \ - helpcontent2/source/text/shared/explorer/database/rep_datetime \ - helpcontent2/source/text/shared/explorer/database/rep_insertfield \ - helpcontent2/source/text/shared/explorer/database/rep_main \ - helpcontent2/source/text/shared/explorer/database/rep_navigator \ - helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \ - helpcontent2/source/text/shared/explorer/database/rep_prop \ - helpcontent2/source/text/shared/explorer/database/rep_sort \ - helpcontent2/source/text/shared/explorer/database/tablewizard00 \ - helpcontent2/source/text/shared/explorer/database/tablewizard01 \ - helpcontent2/source/text/shared/explorer/database/tablewizard02 \ - helpcontent2/source/text/shared/explorer/database/tablewizard03 \ - helpcontent2/source/text/shared/explorer/database/tablewizard04 \ - helpcontent2/source/text/shared/explorer/database/toolbars \ helpcontent2/source/text/shared/fontwork_toolbar \ helpcontent2/source/text/shared/help/browserhelp \ helpcontent2/source/text/shared/guide/aaa_start \ @@ -910,4 +829,88 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/optionen/viewcertificate_g \ )) +$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ + helpcontent2/source/text/shared/explorer/database/02000000 \ + helpcontent2/source/text/shared/explorer/database/02000002 \ + helpcontent2/source/text/shared/explorer/database/02010100 \ + helpcontent2/source/text/shared/explorer/database/02010101 \ + helpcontent2/source/text/shared/explorer/database/04000000 \ + helpcontent2/source/text/shared/explorer/database/04030000 \ + helpcontent2/source/text/shared/explorer/database/05000000 \ + helpcontent2/source/text/shared/explorer/database/05000001 \ + helpcontent2/source/text/shared/explorer/database/05000003 \ + helpcontent2/source/text/shared/explorer/database/05010000 \ + helpcontent2/source/text/shared/explorer/database/05010100 \ + helpcontent2/source/text/shared/explorer/database/05020000 \ + helpcontent2/source/text/shared/explorer/database/05020100 \ + helpcontent2/source/text/shared/explorer/database/05030000 \ + helpcontent2/source/text/shared/explorer/database/05030100 \ + helpcontent2/source/text/shared/explorer/database/05030200 \ + helpcontent2/source/text/shared/explorer/database/05030300 \ + helpcontent2/source/text/shared/explorer/database/05030400 \ + helpcontent2/source/text/shared/explorer/database/05040000 \ + helpcontent2/source/text/shared/explorer/database/05040100 \ + helpcontent2/source/text/shared/explorer/database/05040200 \ + helpcontent2/source/text/shared/explorer/database/11000002 \ + helpcontent2/source/text/shared/explorer/database/11020000 \ + helpcontent2/source/text/shared/explorer/database/11030000 \ + helpcontent2/source/text/shared/explorer/database/11030100 \ + helpcontent2/source/text/shared/explorer/database/11080000 \ + helpcontent2/source/text/shared/explorer/database/11090000 \ + helpcontent2/source/text/shared/explorer/database/dabaadvprop \ + helpcontent2/source/text/shared/explorer/database/dabaadvpropdat \ + helpcontent2/source/text/shared/explorer/database/dabaadvpropgen \ + helpcontent2/source/text/shared/explorer/database/dabadoc \ + helpcontent2/source/text/shared/explorer/database/dabaprop \ + helpcontent2/source/text/shared/explorer/database/dabapropadd \ + helpcontent2/source/text/shared/explorer/database/dabapropcon \ + helpcontent2/source/text/shared/explorer/database/dabapropgen \ + helpcontent2/source/text/shared/explorer/database/dabawiz00 \ + helpcontent2/source/text/shared/explorer/database/dabawiz01 \ + helpcontent2/source/text/shared/explorer/database/dabawiz02 \ + helpcontent2/source/text/shared/explorer/database/dabawiz02access \ + helpcontent2/source/text/shared/explorer/database/dabawiz02ado \ + helpcontent2/source/text/shared/explorer/database/dabawiz02dbase \ + helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc \ + helpcontent2/source/text/shared/explorer/database/dabawiz02ldap \ + helpcontent2/source/text/shared/explorer/database/dabawiz02mysql \ + helpcontent2/source/text/shared/explorer/database/dabawiz02odbc \ + helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \ + helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \ + helpcontent2/source/text/shared/explorer/database/dabawiz02text \ + helpcontent2/source/text/shared/explorer/database/dabawiz03auth \ + helpcontent2/source/text/shared/explorer/database/main \ + helpcontent2/source/text/shared/explorer/database/menubar \ + helpcontent2/source/text/shared/explorer/database/menuedit \ + helpcontent2/source/text/shared/explorer/database/menufile \ + helpcontent2/source/text/shared/explorer/database/menufilesave \ + helpcontent2/source/text/shared/explorer/database/menuinsert \ + helpcontent2/source/text/shared/explorer/database/menutools \ + helpcontent2/source/text/shared/explorer/database/menuview \ + helpcontent2/source/text/shared/explorer/database/migrate_macros \ + helpcontent2/source/text/shared/explorer/database/password \ + helpcontent2/source/text/shared/explorer/database/querywizard00 \ + helpcontent2/source/text/shared/explorer/database/querywizard01 \ + helpcontent2/source/text/shared/explorer/database/querywizard02 \ + helpcontent2/source/text/shared/explorer/database/querywizard03 \ + helpcontent2/source/text/shared/explorer/database/querywizard04 \ + helpcontent2/source/text/shared/explorer/database/querywizard05 \ + helpcontent2/source/text/shared/explorer/database/querywizard06 \ + helpcontent2/source/text/shared/explorer/database/querywizard07 \ + helpcontent2/source/text/shared/explorer/database/querywizard08 \ + helpcontent2/source/text/shared/explorer/database/rep_datetime \ + helpcontent2/source/text/shared/explorer/database/rep_insertfield \ + helpcontent2/source/text/shared/explorer/database/rep_main \ + helpcontent2/source/text/shared/explorer/database/rep_navigator \ + helpcontent2/source/text/shared/explorer/database/rep_pagenumbers \ + helpcontent2/source/text/shared/explorer/database/rep_prop \ + helpcontent2/source/text/shared/explorer/database/rep_sort \ + helpcontent2/source/text/shared/explorer/database/tablewizard00 \ + helpcontent2/source/text/shared/explorer/database/tablewizard01 \ + helpcontent2/source/text/shared/explorer/database/tablewizard02 \ + helpcontent2/source/text/shared/explorer/database/tablewizard03 \ + helpcontent2/source/text/shared/explorer/database/tablewizard04 \ + helpcontent2/source/text/shared/explorer/database/toolbars \ +,shared/explorer/database)) + # vim: set noet sw=4 ts=4: diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index 50fd6aedd9..7c5a9ddc81 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -198,7 +198,7 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) $(call gb_Helper_abbreviate_dirs,\ - RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(addprefix $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/,$(gb_AllLangHelp_$(APPDIR)_HELPFILES))) \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(addprefix $(if $(filter en-US,$(HELP_LANG)),$(SRCDIR),$(call gb_HelpTranslatePartTarget_get_workdir,$(HELP_LANG)))/,$(gb_AllLangHelp_$(APPDIR)_BOOKMARK_HELPFILES))) \ && ( \ <"$$RESPONSEFILE" $(if $(filter WNT,$(OS)),tr -d '\r' | env -i PATH="$$PATH") xargs -n 1 printf '%s\n' \ | while read xhp; do \ -- cgit