diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 15:28:56 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-08-08 14:47:29 +0200 |
| commit | 7dcf2e4ef481881bbe8d7525b479d62850fbdf66 (patch) | |
| tree | c5a4de9dbaeda3e174b636536c0a09a0075510a6 /Repository.mk | |
| parent | 70aa36a378d2adc5b8d757b6fe55e7953b1c4032 (diff) | |
WIP: Include --with-help=html in installation sets
As a first step, include all the instdir/help/* content that comes from
helpcontent2 (there's also some *.xsl files there coming from xmlhelp?) in the
ooo base module:
instdir/help/default.css
fuse.js
help.html
help.js
help2.js
hid2file.js
index.html
media/
normalize.css
paginathing.js
en-US/
<any other locale>/
The locale-independent parts could remain in the ooo base module or could be
split out into some help module (esp. the media/ tree may grow large?). The
per-locale sub-dirs will definitely need to be split into locale-specific
modules in a next step.
Change-Id: I3e7b1b0e9c965372a23a51ed8ddc809e395fd891
Reviewed-on: https://gerrit.libreoffice.org/53213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 2ecb47808d50..a3c640458cd8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -792,10 +792,6 @@ $(eval $(call gb_Helper_register_packages, \ test_unittest \ cli_basetypes_copy \ extras_wordbook \ - $(if $(ENABLE_HTMLHELP),\ - helpcontent2_html_static \ - helpcontent2_html \ - ) \ instsetoo_native_setup \ $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \ postprocess_registry \ @@ -946,6 +942,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ sfx2_classification \ $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \ $(if $(and $(filter WNT,$(OS)), $(filter X86_64,$(CPUNAME))),twain_dsm) \ + $(if $(ENABLE_HTMLHELP),\ + helpcontent2_html \ + helpcontent2_html_generated \ + helpcontent2_html_media \ + helpcontent2_html_static \ + ) \ )) $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ |