postprocess/CustomTarget_images.mk | 5 +++--
solenv/bin/pack_images.py | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 906a2e4fa4e9ce231126c608e741c0c0d809157d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Feb 22 14:37:32 2018 +0100
Always execute pack_images.py with the right Python interpreter
With --enable-python=fully-internal, where PYTHON_FOR_BUILD is empty, this
executed the "#!/usr/bin/env python" shebang in pack_images.py, using
whatever
python would be found (or not) on the system.
With this fixed, there is no need any more for pack_images.py to be
executable.
Change-Id: I40ad3769898f3eb711dbe555d4c3faa9e3c1456d
Reviewed-on: https://gerrit.libreoffice.org/50180
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/postprocess/CustomTarget_images.mk
b/postprocess/CustomTarget_images.mk
index 871c7bd6470c..77c653abf3fe 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -29,11 +29,12 @@ $(packimages_DIR)/%.zip : \
$(packimages_DIR)/commandimagelist.ilst \
$(packimages_DIR)/sourceimagelist.ilst \
$(SRCDIR)/wizards/source/imagelists/imagelists.ilst \
- $(call gb_Helper_get_imagelists)
+ $(call gb_Helper_get_imagelists) \
+ | $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter
%.ilst,$^)) && \
- $(PYTHON_FOR_BUILD) $(SRCDIR)/solenv/bin/pack_images.py \
+ $(call gb_ExternalExecutable_get_command,python)
$(SRCDIR)/solenv/bin/pack_images.py \
$(if $(DEFAULT_THEME),\
-g $(packimages_DIR) -m $(packimages_DIR) -c
$(packimages_DIR),\
-g $(SRCDIR)/icon-themes/$(subst images_,,$*)
-m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst
images_,,$*) \
diff --git a/solenv/bin/pack_images.py b/solenv/bin/pack_images.py
old mode 100755
new mode 100644
index 0f493c8f3035..bd75b9044210
--- a/solenv/bin/pack_images.py
+++ b/solenv/bin/pack_images.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
#
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
