Kaydet (Commit) 906a2e4f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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/50180Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 50bf4eec
......@@ -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_,,$*) \
......
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment