diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-12 10:19:02 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-12 11:26:53 +0200 |
| commit | e21698f795b4098ecccf3119e23edd3d9e7aac1e (patch) | |
| tree | c4f8aee9f91cab69fef2098fc8318005bb2e4c5a /CustomTarget_html.mk | |
| parent | a5f1ad79fc3c7a7bf358f1ab9afe79269f5b8cf5 (diff) | |
Fix helpers/make_icon_link.txt.py
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>
Diffstat (limited to 'CustomTarget_html.mk')
| -rw-r--r-- | CustomTarget_html.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index b9eab167f7..cd53b9c6a3 100644 --- a/CustomTarget_html.mk +++ b/CustomTarget_html.mk @@ -157,8 +157,10 @@ $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \ # link txt file for icon replacement table $(SRCDIR)/helpcontent2/helpers/links.txt.xsl: \ - $(SRCDIR)/icon-themes/colibre/links.txt - $(SRCDIR)/helpcontent2/helpers/make_icon_link.txt.py $(SRCDIR)/icon-themes/colibre/links.txt $@ + $(SRCDIR)/icon-themes/colibre/links.txt \ + $(SRCDIR)/helpcontent2/helpers/make_icon_link.txt.py \ + $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/helpcontent2/helpers/make_icon_link.txt.py $(SRCDIR)/icon-themes/colibre/links.txt $@ define html_gen_html_dep $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/html.text : \ |