[Libreoffice-commits] core.git: editeng/CustomTarget_generated.mk solenv/bin sw/CustomTarget_generated.mk

[Stephan Bergmann (via logerrit)]

 editeng/CustomTarget_generated.mk |    2 +-
 solenv/bin/gentoken.py            |    1 -
 sw/CustomTarget_generated.mk      |    4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit d257314af28c3e956757c0856490ba70104dfcc0
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 2 11:54:18 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Mar 3 10:42:09 2020 +0100

    Fix call of Python
    
    ...where $(PYTHON) is undefined, but which was mostly masked by
    solenv/bin/gentoken.py happening to have a shebang line, except for flatpak
    builds now failing with
    
    > /usr/bin/env: ‘python’: No such file or directory
    > make[1]: *** [/run/build/libreoffice/editeng/CustomTarget_generated.mk:18: /run/build/libreoffice/workdir/CustomTarget/editeng/generated/tokens.gperf] Error 127
    
    (See also discussion in the comments of
    <https://gerrit.libreoffice.org/c/core/+/89262> "Convert gentoken from Perl to
    Python.")
    
    Change-Id: Iebdf98d7b7ee4da9d861231064549ffef5445edc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89828
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/editeng/CustomTarget_generated.mk b/editeng/CustomTarget_generated.mk
index 8a24792ed656..77fb4f7bf383 100644
--- a/editeng/CustomTarget_generated.mk
+++ b/editeng/CustomTarget_generated.mk
@@ -16,7 +16,7 @@ editeng_INC := $(call gb_CustomTarget_get_workdir,editeng/generated)
 $(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.txt $(editeng_PY) \
         $(call gb_ExternalExecutable_get_dependencies,python)
 	mkdir -p $(editeng_INC)
-	$(PYTHON) $(editeng_PY) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf
+	$(call gb_ExternalExecutable_get_command,python) $(editeng_PY) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf
 
 $(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf
 	$(GPERF) --compare-strncmp --readonly-tables --output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf
diff --git a/solenv/bin/gentoken.py b/solenv/bin/gentoken.py
old mode 100755
new mode 100644
index f85aec2cce3e..f4954db729b2
--- a/solenv/bin/gentoken.py
+++ b/solenv/bin/gentoken.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
index fb3f842d382a..80a1c1642ea9 100644
--- a/sw/CustomTarget_generated.mk
+++ b/sw/CustomTarget_generated.mk
@@ -16,12 +16,12 @@ sw_INC := $(call gb_CustomTarget_get_workdir,sw/generated)
 $(sw_INC)/TextBlockTokens.gperf : $(sw_SRC)/TextBlockTokens.txt $(sw_PY) \
 			$(call gb_ExternalExecutable_get_dependencies,python)
 	mkdir -p $(sw_INC)
-	$(PYTHON) $(sw_PY) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf
+	$(call gb_ExternalExecutable_get_command,python) $(sw_PY) $(sw_SRC)/TextBlockTokens.txt $(sw_INC)/TextBlockTokens.gperf
 
 $(sw_INC)/BlockListTokens.gperf : $(sw_SRC)/BlockListTokens.txt $(sw_PY) \
 		$(call gb_ExternalExecutable_get_dependencies,python)
 	mkdir -p $(sw_INC)
-	$(PYTHON) $(sw_PY) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf
+	$(call gb_ExternalExecutable_get_command,python) $(sw_PY) $(sw_SRC)/BlockListTokens.txt $(sw_INC)/BlockListTokens.gperf
 
 $(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens.gperf
 	$(GPERF) --compare-strncmp --readonly-tables --output-file=$(sw_INC)/tokens.cxx \