summaryrefslogtreecommitdiff
path: root/CustomTarget_html.mk
AgeCommit message (Collapse)Author
2023-09-27tdf#157360 Local help should not phone homeOlivier Hallot
+ Remove call to matomo TDF server instance when help is local + Keep when Help is online. + refactor javascript Change-Id: I285b426531c91ff558c01798f803bf3f89720b1f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157255 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit 0c24f409c31e4ca8a85b6a1486e2c6eaf26942d6) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/157221 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-01-25Recipe has no dependency on target dirStephan Bergmann
Seen this fail once at <https://buildbot.flathub.org/#/builders/31/builds/1623>, > cp: cannot create regular file '/run/build/libreoffice/workdir/CustomTarget/helpcontent2/help3xsl/online_transform.xsl': No such file or directory > make[1]: *** [/run/build/libreoffice/helpcontent2/CustomTarget_html.mk:186: /run/build/libreoffice/workdir/CustomTarget/helpcontent2/help3xsl/online_transform.xsl] Error 1 Change-Id: I8cfa387d1bb2ef488f5f34ff20b9dc975d424751 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146141 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-12-22janitor - the announce is not meant to be part of the dependenciesChristian Lohmaier
quirk introduced with the change making the xsltproc one an order-only dependency. The line-continuation wasn't removed with that change causing the annouce to fire when make is parsing the makefile. Doesn't hurt anything or affected the build result in any way, but certainly not as intended :-) Change-Id: I82069208fff1ff0c01efba00caa2d8fa5279efaf Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144760 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-22make html.text target make more robust on windows re CR at EOLChristian Lohmaier
some cygwin setups still treat the final CR as part of the filename, so avoid that problem alltogether by simply appending a dummy entry to each line on the responsefile to catch any stray EOL/EOF characters Change-Id: I624eeeca033f72b2845394b44f27b6e32d01eb70 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144758 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-20add gbuild trace annotations for targets in CustomTarget_html.mkChristian Lohmaier
at least for those that are not a simple cat, echo/printf or sed call Change-Id: I81e7682890a011aaea2603ef4c0a2e71d82a8511 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144591 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-19Fix typoAndrea Gelmini
Change-Id: Iede879decee335d13e50df7244326dbc44728145 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144503 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2022-12-19janitor: update comment for the bookmarks.part ruleChristian Lohmaier
the remarks about the indicator files are obsolete after the rule has been rewritten to work in batch and not on single files Change-Id: I8a2509aed7a38b9cff0dacec3d4161bc020fde31 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144468 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-18janitorial cleanup/minor optimizationsChristian Lohmaier
mostly making xstlproc and python order-only dependencies, simplifying some of the print statements/remove sed or grep calls that can be handled by make's own text functions Change-Id: If4f8ef145d7721384e914ae79494c500bbf244dc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144410 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-18process files for bookmarks.part in bulkChristian Lohmaier
instead of running xsltproc for each file, pass multiple files at once, greatly reducing the overhead of the processing, especially on Windows/cygwin. since it not only removes the need for the xsltproc invocations, but also for the surrounding workarounds with the rm, touch, rm of the indicator file. Change-Id: I4588bfc869c668a41da29b5d4080a600ed02223b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144409 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-17reduce number of process calls when building html helpChristian Lohmaier
For each language times the 2500+ xhp files the build did run dirname, mkdir, and pwd (twice, and on windows also with additional cygpath) - replacing those by static values provided my make saves 4-5 minutes on a fast m1 machine and over 25 on windows with cygwin (despite building with 32 threads...) Change-Id: Ib3ca9e2ffdea622a4b5f578f2580152eb0b3b674 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144393 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-16fix missing ) in the if statement.Christian Lohmaier
Change-Id: I6b2a45aeda8969778e902ae71e3fa5e46b82875a
2022-12-15cd to helpcontent2/source/text & drop it from filenames for larger batchesChristian Lohmaier
On the Jenkins Windows builder only 40~45 of the ~2500 helpfiles can be processed at once when not stripping that prefix. With the shortened filenames the build needs less than half of the xsltproc invocations. Also prevent a trailing carriage return to be interpreted as part of the filename on windows and drop the abbreviate_dir wrapper around the command since there's nothing left to shorten anymore. Change-Id: Ifaff26f73f262bd1d7cb4f813bf081782661ba17 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144236 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-14Fix prepending xargs to gb_ExternalExecutable_get_command, help partStephan Bergmann
...as was done in f048f02f505704a76c4f01b4ff3f369e8ed928b5 "hid2file.js generation: process in batch, not each file one-by-one", causing my build to fail with > [XSL] CustomTarget/helpcontent2/help3xsl/hid2file.js > xargs: LD_LIBRARY_PATH=/home/sbergman/gcc/trunk/inst/lib64:/home/sbergman/lo/core/instdir/program:/home/sbergman/lo/core/instdir/program: No such file or directory Change-Id: I94ea42878de55a887e6955b350997425438bb90e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144154 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-12-13hid2file.js generation: process in batch, not each file one-by-oneChristian Lohmaier
xsltproc can happily process many files at once, no need to process them individually and also no need to surround them with the rm, touch, rm triplet each time to catch a possible error. When letting xargs actually run the command, then xargs will report error if any invocation failed. It will not stop execution commands for remaining input unless the command exists with status 255 explicitly, but this doesn't matter, processing the whole batch regardless is still much faster than processing each file separately. To maximize the number of files that can be processed in a single command, don't prefix each file with $(SRCDIR)/, but instead cd to $(SRCRDIR) before running the command. Change-Id: I532a54f7298d7011900af5e618d75b37649b0477 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/144050 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-12-13gb_var2file: remove now unused chunk-size parameter (help repo)Christian Lohmaier
Change-Id: Ie0a310b004d969b62c9ee886fee3e8e50d6e5184 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143935 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-01-25tdf#123318 tdf#129697 Don't hardcode product name in CSS and JSIlmari Lauhakangas
Change-Id: I0ef315146fed188eb1cf33c416ff5f3e9899bbae Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128524 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2021-11-04Adapt helpcontent2 to var2file renameStephan Bergmann
...in core commit 3829c0c7db8768ca05f148e8f5c271ddb56d5bae "Resolves: tdf#97046 ensure build system variables start with gb_" Change-Id: I2d9f579921843dbfb55efde492ea19abb3c6782e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124682 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-06-13tdf#133928 Help need javascript enabled in browserOlivier Hallot
Helpcontent2 part Also, optimize XSLT brand template Change-Id: Idfe3647306452f1f8be5632f1e1a70d642533406 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96238 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-05-29Restore sort for IndexOlivier Hallot
Generates a sorted bookmark.js file Change-Id: Iea7a6485aebe504da9f8d66236e3fe600097bafa Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95091 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-05-16Refactor database help pageOlivier Hallot
Open a new module sdatabase and add one entry file. Later, and very slowly, move database help pages from shared/explorer/database/* to sdatabase/* Note: Each move will trigger translation so better move only a few files per translation cycle, not to overload translators. Translation memory should easy the traslation job. Change-Id: I8e2be9c9355b966775fb5dacc5d63b852be7187a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94362 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-05-13tdf#128519 Icon replacement table in build timeOlivier Hallot
As explained in tdf#128519, command <include> in XLST must have its href= hardcoded. Thus, copy online_transform.xsl and create links.txtx.xsl in workdir/ Change-Id: I979fd58f16a51ae6f57fc6f87349700eafdefbd7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94082 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-12Fix helpers/make_icon_link.txt.pyStephan Bergmann
It contained Python-2--isms that caused errors when /usr/bin/python is Python 3 (at least on Fedora 32 with python-unversioned-command-3.8.2-2.fc32.noarch and python3-3.8.2-2.fc32.x86_64): > File "helpcontent2/helpers/make_icon_link.txt.py", line 21 > print "There was an error reading", file_icon > ^ > SyntaxError: Missing parentheses in call to 'print'. Did you mean print("There was an error reading", file_icon)? and > File "helpcontent2/helpers/make_icon_link.txt.py", line 39 > if line.find('png',0, len(line)) <> -1 : > ^ > SyntaxError: invalid syntax So fix helpers/make_icon_link.txt.py to be proper Python 3 and explicitly execute it with gb_ExternalExecutable_get_command,python instead of via a /usr/bin/python shebang. (That file was apparently not executed during the build prior to ee180ade07e36dd1fb8c7bdca6ecbab44ded9eb8 "tdf#128519 Automate icon repl't table for Help bld", so these issues were not noticied earlier.) Change-Id: Ia3cff9538ab537076a02b64ad8c1bf56dcfaf30b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94039 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-11tdf#128519 Automate icon repl't table for Help bldOlivier Hallot
The solution here is to create links.txt.xsl in the helpcontent2/helpers/ folder at build time because the <include> directive in XSLT of online_transform.xsl must be hardcoded (compile time) and core/workdir/ is not. Change-Id: I8c4c8d0b8aed58c10a95c5d42bbd1b8acdb39614 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93436 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-12-01Add dep's for xapian-omindex buildOlivier Hallot
Change-Id: If3e3efbb04e40c906618aec8da5552560bd0678e Reviewed-on: https://gerrit.libreoffice.org/84145 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-11-14Fix L10N of xapian templatesOlivier Hallot
Change-Id: I23e3adc4a4232e9f9d998fa9f41951f7c530c335 Reviewed-on: https://gerrit.libreoffice.org/82721 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-10-14More work on Xapian result pageOlivier Hallot
Added module dropdown fix TODO: Language Change-Id: I47012d6280694d87fb5d19e25c6052b8a7ed89c7 Reviewed-on: https://gerrit.libreoffice.org/80771 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-10-01redmine#2555 replace Help online Google searchOlivier Hallot
This is the helpcontent2/ part of the patch. Add xapian-omega search to online Help. The patch replaces Google custom search with xapian-omega search. A new build key is introduced. --with-omindex=server : Localizes and adds the xapian result page template, adds the xapian form to each Help page. --with-omindex=noxap : do not localize the result template and do not add a form in the Help page. --with-omindex= will force Online Help build. Default is noxap NOTES: - xapian-omega databases are built in the server. - searches returns results only on localized Help pages, avoiding same resulis in many languages. TODO: - Tweak the xapian-omega result page CSS and markup. Change-Id: I3dc2b79c4111f61fd5fea01b1f8c95bfacab1e8f Reviewed-on: https://gerrit.libreoffice.org/79366 Tested-by: Jenkins Reviewed-by: Guilhem Moulin <guilhem@libreoffice.org> Tested-by: Guilhem Moulin <guilhem@libreoffice.org>
2019-05-23Untangle Help Contents for Impress and DrawOlivier Hallot
Create a separated sdraw.tree for Contents and move entries from Impress tree to Draw tree. Common contents are maintained in both trees. This is work in progress. Draw and Impress Help pages need update especially for menus. Change-Id: I179a5ee7407c4a8357a87b2e7a0d8782b7bb0520 Reviewed-on: https://gerrit.libreoffice.org/72693 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-04-23fix forgotten LANG->LANGUAGEhimajin100000
Change-Id: Idcfd73213452510f769854062d0916a3c871b548 Reviewed-on: https://gerrit.libreoffice.org/70982 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-04-18Don't set LANG env var by accidentStephan Bergmann
...as setting a GNU Make LANG var exports it to recipes as an env var, and see e.g. 56bc0b1a376f62570a7287e9bb4193e00360c978 "Don't set locale env vars on macOS" for potential problems caused by that. This is the help half of a change spanning the core and help repos. Change-Id: Ib5faf612e9030db384f7408ecd4fd03e65120f17 Reviewed-on: https://gerrit.libreoffice.org/70930 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-04-06Revert "Create XSLT replacement table for missing icons"Olivier Hallot
This reverts commit 61f44912beec99f6211399ce567274aa369f817d. Change-Id: Icd69ccd4f487a82426a00169728ec62bbff6d0b6 Reviewed-on: https://gerrit.libreoffice.org/70350 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-04-06Create XSLT replacement table for missing iconsOlivier Hallot
Missing UI icons have a replacement table in /core/icon-themes/colibre/links.txt Help must also use this replacement table when Help pages have missing icons. The previous approach was a manual creation of a XSLT for the replacement. The patch moves the replacement table creation inside the Custom makefile, making it automatic and carrying changes of the original links.txt source. Change-Id: I7f834fa03bbd85f329efbec43e5c51cc86d51586 Reviewed-on: https://gerrit.libreoffice.org/70080 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-03-26Add module name to Contents link URLOlivier Hallot
Add ?DbPAR=<MODULE> to the contents link URL. <smodule>.tree does not have the DbPAR param in the link URLs. 2 possibiltites: 1) Add to the source files *.tree and we are done (triggers retranslation) 2) get module name at build time and add to the resulting tree (this solution) Change-Id: I2a3c1edcec7dd824a44bb93f0343ec8cb88cb0c4 Reviewed-on: https://gerrit.libreoffice.org/69714 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2019-02-25Propagate xsltproc failure, part 2Stephan Bergmann
...following up on c3509fb7e6675a38560c7e2764b21861d1e23362 "Propagate xsltproc failure". The while loops would only have a non-zero exit code if the xsltproc invocation in the last iteration of the loop fails. (Oddly, adding `set -e` instead seems to have no effect.) Change-Id: I9296a59147697595ebe7b0d2b742044f8a8a3f02 Reviewed-on: https://gerrit.libreoffice.org/68309 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-02-22Propagate xsltproc failureStephan Bergmann
Change-Id: I26516bb718b678718822ef8621bbfb868016d626 Reviewed-on: https://gerrit.libreoffice.org/68192 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-02-15tdf#121532 Don't use non-standard `echo -n`Stephan Bergmann
At least the version of echo used to build TDF's LO 6.2.0.3 release apparently doesn't understand that non-standard option and printed out "-n" verbatim, generating a broken languages.js. (Though my local macOS 10.14.3 /bin/echo does understand that option.) Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1 Reviewed-on: https://gerrit.libreoffice.org/67858 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-14Database files should appear with app:"BASE" in instdir/help/*/bookmarks.jsStephan Bergmann
...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 <https://gerrit.libreoffice.org/#/c/63364/> "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 <sbergman@redhat.com>
2018-11-09tdf#119415 change from fuse.js to fuzzysort.jsIlmari Lauhakangas
Tied the index listing to the current module. Fuzzysort.js is MIT licensed. Change-Id: I5d95cc1870a1856089217846ed0af572abc882d7 Reviewed-on: https://gerrit.libreoffice.org/63203 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2018-08-16Translate the language names in JS.Jan Holesovsky
Change-Id: I7185a7d0981abbacef4a152ee6ac5352ebe970cd Reviewed-on: https://gerrit.libreoffice.org/59150 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2018-08-16Limit the online help only to the built languages.Jan Holesovsky
Change-Id: Ib81dbd9a4047d9bb63761a43ef0b183a450b03f1 Reviewed-on: https://gerrit.libreoffice.org/59047 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-08-14Rename 'map' to 'hid2fileMap'.Jan Holesovsky
Also update dependency, so that the file gets rebuilt when the 'echo' part of the makefile changes. Change-Id: I0412f882dd12e265d8261a259ed83c469e261cdf Reviewed-on: https://gerrit.libreoffice.org/58993 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-08-14Rename get_url.xsl to generate_hid2file.xsl, because that's what it's doing.Jan Holesovsky
Change-Id: I565ca442281fa8a80a59d1038d29b34d7f9d9f41 Reviewed-on: https://gerrit.libreoffice.org/58989 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2018-08-09Use PRODUCTNAME from the configure.Jan Holesovsky
Change-Id: Ibc742e653f44093372bed4e103fedb3a597dfdac Reviewed-on: https://gerrit.libreoffice.org/58793 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-06-06Clean up space/tab mixtureStephan Bergmann
At least Emacs warned about those "suspicious lines". Change-Id: I587e7d65318a7fdb1634e49f2db761c853e67b05 Reviewed-on: https://gerrit.libreoffice.org/55383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-06-06(Partially) fix --with-help=html dependencies on .xhp filesStephan Bergmann
There are three rules in helpcontent2/CustomTarget_html.mk that process (with XSLT) all or some of the .xhp files in the helpcontent2/source/text/ tree (for en-US; or their translations in the workdir/HelpTranslatePartTarget/*/helpcontent2/source/text/ trees for other languages). Lists of all those .xhp files are defined in helpcontent2/AllLangHelp_*.mk (with gb_AllLangHelp_add_helpfiles), but the code in helpcontent2/CustomTarget_html.mk used `find` to assemble the relevant lists. That has two issues (at least for the en-US case operating on the untranslated helpcontent2/source/text/ files): For one, if the content of those .xhp files changes, the relevant XSLT processing is not re-run. For another, if .xhp files are added to or removed from the lists in helpcontent2/AllLangHelp_*.mk, the relevant XSLT processeing is not re-run, either. For the processing of translated .xhp files, there were already dependencies on those translated files in place. I assume (but have not really proved it) that those dependencies are already sufficient to cover both of the above issues. That only leaves the en-US case, operating on the untranslated files. The lists of .xhp files as defined in helpcontent2/AllLangHelp_*.mk (with "*" ranging over the various "modules": sbasic, scalc, schart, etc.) are now made available in gb_AllLangHelp_*_HELPFILES variables. The contents of those variables is used instead of `find` to pass the relevant .xhp files to the XSLT processings. (Needing some RESPONSEFILE and `xargs -n 1` boilerplate to feed individual files to the XSL processing without overflowing maximum command line lengths. Also, on Windows, var2file apparently writes CRLF line ends but the CR parts need to be filtered out again, and xargs problems must be worked around similar to df9edbcd2883cec2d0596133131cfbc220dee91f "Work around 'xargs: environment is too large for exec' errors on Windows".) However, those variables apparently cannot be used to specify dependencies for the three XSLT-processing rules. Presumably, the variables do not necessarily have their values assigned yet by the time the rules' dependencies are constructed (depending on the order in which .mk files are read?). So "dummy" gb_AllLangHelp_get_helpfiles_target targets are introduced, which depend on all the relevant .xhp files (and which get constructed during gb_AllLangHelp_add_helpfiles, just like the gb_AllLangHelp_*_HELPFILES variables), and which the XSLT-processing rules in turn depend on. That makes sure that the XSLT-processing rules are re-run when the content of .xhp files changes or when new .xhp files are added. However, the above still fails to re-run the XSLT-processing rules when .xhp files are removed. This is the helpcontent2 part of a commit spanning core and helpcontent2. Change-Id: I9a72c0f6837a8e13458a703fdecf7e5b0ef2076f Reviewed-on: https://gerrit.libreoffice.org/55364 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-05-24Properly handle language-specific parts of --with-help=html media/ sub-treeStephan Bergmann
...that previously ended up in language-independent parts of installation sets. The structure of that media/ tree doesn't allow to directly mis-use the existing AllLangPackage machinery (which expects the language to be encoded in the first pathname segment within the tree; and which is already mis-used for the helpcontent2/AllLangPackage_html_lang.mk parts). So introduce gb_AllLangPackage_add_files_for_lang that allows to specify the language explicitly, independent of where it is encoded in the pathname (if at all). The underlying gb_AllLangPackage_add_file sets a gb_AllLangPackage_ALLDIRS that is used by `make packageinfo`, which may need further fixing by anybody actually using that target; see the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2018-May/080242.html> "Broken --with-help=html `make packageinfo`". All files in $(SRCDIR)/helpcontent2/source/media/ must now explicitly be listed in either helpcontent2/Package_html_media.mk (for the language-independent files) or helpcontent2/AllLangPackage_html_media_lang.mk (for the language- specific files). Also note the two TODOs in helpcontent2/AllLangPackage_html_media_lang.mk. What is not quite right yet is that content from helpcontent2/AllLangPackage_html_lang.mk and helpcontent2/AllLangPackage_html_media_lang.mk is ending up in both per-language helpcontent installation sets (as intended, via the instructions in helpcontent2/CustomTarget_html.mk) and per-language languagepack installation sets (which is unintended). This needs to be fixed with a follow-up commit. This is the helpcontent2 part of a commit spanning core and helpcontent2. Change-Id: Ie7916b75eee0dde3106e784d19e99fde5bb93195 Reviewed-on: https://gerrit.libreoffice.org/54749 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-05-02tdf#116240: Include --with-help=html in installation setsStephan Bergmann
...by extending the hackery in helpcontent2/CustomTarget_html.mk (see comment there). (Ultimately, the gbuild HelpTarget machinery should probably be adapted to the needs of this new help format, once the old help format is no longer supported?) The Perl packaging code finds source files through the "include" paths specified in instsetoo_native/util/openoffice.lst.in. To avoid potential name clashes, put the new .filelist files into workdir/CustomTarget/helpcontent2/help3xsl/filelists/html-help/ sub-directories. read_filelist in solenv/bin/modules/installer/filelists.pm does not strip white space following the last item in a file list, but (with HAVE_GNUMAKE_FILE_FUNC) the gb_HelpTarget_get_translation_target .filelist files (which are then transformed with sed into the .html .filelist files read by the Perl packaging code) may contain such trailing white space. So $(strip ...) their content in solenv/gbuild/HelpTarget.mk. This is the helpcontent2 part of a change spanning core and helpcontent2. Change-Id: I730caaaec783d0a0a9c79caf85268a775220dee3 Reviewed-on: https://gerrit.libreoffice.org/53724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-05-02Make --with-help=html work on WindowsStephan Bergmann
Change-Id: Ib8168a6ac770e81a8e5049d8d60e63aa04c7e64b Reviewed-on: https://gerrit.libreoffice.org/53722 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-14tdf#116296 remove produt version from help pathOlivier Hallot
Part two. Part 1 is in sfx2 module Remove product version from offline help path but keep in online help. Product version is kept for online because a help server can have more than one helponline version. Change-Id: I1d4ba12a7d6472defd4210c79349e35ccaf32d8d Reviewed-on: https://gerrit.libreoffice.org/51126 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-02-08tdf#115255 and auto-expand contents per subitemIlmari Lauhakangas
JavaScript stuff moved from online_transform.xsl to help.js. Simplified bookmarks markup. Span elements with class "input" and length more than 3 characters can be copied to clipboard by mouse click. Bubli's feature request for auto-expanding contents per subitem is also implemented. Logic for adding headings to index list was reimplemented. Change-Id: I87b6f189a040a73a1ab9dda1ec9cd790b06da202 Reviewed-on: https://gerrit.libreoffice.org/49421 Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
generated by cgit (git 2.34.1) at 2025-01-10 01:07:28 +0000