diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-05 10:57:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-05 14:11:58 +0000 |
| commit | 4ae49101fd43d052c3556b2db753e4d8ae7d86ce (patch) | |
| tree | 4ed298c3ca0d1c1c6b59e5e1a4145babcac2c179 /nlpsolver | |
| parent | 5a36a0cab0d4d32968404c0d88772e1a6303af00 (diff) | |
fdo#53009: Compile extension help in gbuild
...as had been done in the old build system (solenv/inc/extension_helplink.mk).
Especially for bundled extensions, this removes the need to compile the help
data per user on first start.
gb_Extension_add_helpfile(s) replaces gb_Extension_localize_help, and takes care
of all the steps (localization, compilation, inclusion in .oxt), even for the
en-US data (which was handled with additional gb_Extension_add_file calls
before).
(cherry picked from commit b23bb8e0de3dbdc2c66c3dedf70dfd318868f76c with
additional fixes from follow-up commits 152ffaa15f963f92b1564946a648c53d6b5c808c
"Call HelpIndexer/Linker with gb_Helper_set_ld_path" and
a297372210396260da57f34da3790f76682603cc "Quote .ddf content (potentially
containing stuff like '%2F')")
Conflicts:
solenv/gbuild/Extension.mk
solenv/gbuild/ExtensionTarget.mk
Change-Id: Ie4bab66d3cad2b713780a23bf2606ca56cfff37f
Reviewed-on: https://gerrit.libreoffice.org/563
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'nlpsolver')
| -rw-r--r-- | nlpsolver/Extension_nlpsolver.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk index b7de4b0883ef..6f2690f1ebd9 100644 --- a/nlpsolver/Extension_nlpsolver.mk +++ b/nlpsolver/Extension_nlpsolver.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # @@ -39,11 +40,9 @@ $(eval $(call gb_Extension_add_file,nlpsolver,locale/NLPSolverStatusDialog_en_US $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.properties)) $(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverStatusDialog_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties)) -$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ - $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) -$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ - $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp)) -$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \ - $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp)) -$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \ - $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp)) +$(eval $(call gb_Extension_add_helpfiles,nlpsolver,$(SRCDIR)/nlpsolver/help/en, \ + com.sun.star.comp.Calc.NLPSolver/Options.xhp \ + com.sun.star.comp.Calc.NLPSolver/Usage.xhp \ +)) + +# vim: set noet sw=4 ts=4: |