[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/AllLangMoTarget.mk |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 8c9ed261cb9201774943e438cf5394c1dcfa8c49
Author: Michael Stahl <mst...@redhat.com>
Date:   Mon Jul 24 12:00:47 2017 +0200

    gbuild: AllLangMoTarget: stop reinventing the python wheel
    
    It also doesn't work on WNT where python_shell does not exist, and on
    OSX where python3 is not a Package but a GeneratedPackage.
    
    Change-Id: Ia4004f56d9168a05b3bd49e66c30502962c07698

diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk
index 8276f76a0b98..a16dc87f0064 100644
--- a/solenv/gbuild/AllLangMoTarget.mk
+++ b/solenv/gbuild/AllLangMoTarget.mk
@@ -25,14 +25,6 @@
 
 # MoTarget
 
-ifeq ($(SYSTEM_PYTHON),)
-gb_Python_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
-gb_Python_DEPS ?= $(call gb_Package_get_target,python3) $(call 
gb_Package_get_target,python_shell)
-else
-gb_Python_EXECUTABLE := $(PYTHON_FOR_BUILD)
-gb_Python_DEPS :=
-endif
-
 $(call gb_MoTarget_get_clean_target,%) :
        $(call gb_Output_announce,$*,$(false),RES,2)
        $(call gb_Helper_abbreviate_dirs,\
@@ -40,14 +32,17 @@ $(call gb_MoTarget_get_clean_target,%) :
                        $(call gb_MoTarget_get_target,$*) \
                        $(call gb_MoTarget_get_install_target,$*))
 
-$(call gb_MoTarget_get_target,%) : $(gb_Helper_MISCDUMMY) $(gb_Python_DEPS)
+$(call gb_MoTarget_get_target,%) : \
+               $(gb_Helper_MISCDUMMY) \
+               $(call gb_ExternalExecutable_get_dependencies,python)
        $(call gb_Output_announce,$*,$(true),MO,2)
 #       after translate should look like this
 #        $(call gb_Helper_abbreviate_dirs,\
 #                mkdir -p $(dir $@) && \
 #                $(MSGUNIQ) 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po | $(MSGFMT) - -o $@)
        $(call gb_Helper_abbreviate_dirs,\
-               mkdir -p $(dir $@) && $(gb_Python_EXECUTABLE) 
$(SRCDIR)/solenv/bin/interim-update-module-for-gettext 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION) $@.po && \
+               mkdir -p $(dir $@) && \
+               $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/solenv/bin/interim-update-module-for-gettext 
$(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION) $@.po && \
                $(MSGUNIQ) --force-po $@.po | $(MSGFMT) - -o $@)
 
 #$(info $(call gb_MoTarget_get_target,$(1)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits