diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-31 17:24:28 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-11-05 14:40:53 +0100 |
| commit | 73fdc1e11bdb38de212b8bc223f2fbb4fab01083 (patch) | |
| tree | 0ba9f9dec1e7736f16cacb6b95d44ce5a123e3a5 /postprocess | |
| parent | b0dbd78d010509fa9048126fd3ff24afde687136 (diff) | |
Package separate SVG icon sets
This change packages all SVG based icon sets in seperate zip
files. It automatically generates the SVGs links.txt from
the non-SVG version, if it doesn't exists by 's/\.png/\.svg/g'.
Same for the _dark version, but this just copies it.
This would also work for a _dark_svg version, if needed.
The patch explicitly does't package sifr_svg and tango_svg.
Change-Id: I8d7fda42d0ff9a2108ba8406bd4e82af4c54ff0c
Reviewed-on: https://gerrit.libreoffice.org/62706
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 0768ee973c5e..0ecd76d37035 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -14,6 +14,7 @@ packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images) $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\ $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \ + $(foreach theme,$(WITH_THEMES),$(theme)_links.txt) \ commandimagelist.ilst \ sourceimagelist.ilst \ sorted.lst \ @@ -21,14 +22,28 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\ $(packimages_DIR)/images.zip : DEFAULT_THEME := $(true) $(packimages_DIR)/images_%.zip : DEFAULT_THEME := -$(packimages_DIR)/images_tango.zip : INDUSTRIAL_FALLBACK := -c $(SRCDIR)/icon-themes/industrial -$(packimages_DIR)/images%.zip : INDUSTRIAL_FALLBACK := -$(packimages_DIR)/%.zip : \ +$(packimages_DIR)/%_links.txt : + @if test -f "$(SRCDIR)/icon-themes/$*/links.txt"; then \ + cp "$(SRCDIR)/icon-themes/$*/links.txt" $@.tmp ; \ + else \ + THEME_FILE="$(SRCDIR)/icon-themes/$(subst _svg,,$*)/links.txt" ; \ + if test -f "$${THEME_FILE}"; then \ + sed 's/\.png/\.svg/g' "$${THEME_FILE}" > $@.tmp ; \ + fi ; \ + THEME_FILE="$(SRCDIR)/icon-themes/$(subst _dark,,$*)/links.txt" ; \ + if test -f "$${THEME_FILE}"; then \ + cp "$${THEME_FILE}" $@.tmp ; \ + fi ; \ + fi + $(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@) + +$(packimages_DIR)/images_%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ $(packimages_DIR)/sourceimagelist.ilst \ $(SRCDIR)/wizards/source/imagelists/imagelists.ilst \ + $(packimages_DIR)/%_links.txt \ $(call gb_Helper_get_imagelists) \ | $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) @@ -37,10 +52,10 @@ $(packimages_DIR)/%.zip : \ $(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_,,$*) \ + -g $(SRCDIR)/icon-themes/$* -m $(SRCDIR)/icon-themes/$* -c $(SRCDIR)/icon-themes/$* \ ) \ - $(INDUSTRIAL_FALLBACK) \ -l $${ILSTFILE} \ + -L $(packimages_DIR)/$*_links.txt \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ rm -rf $${ILSTFILE}) @@ -68,7 +83,9 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(SRCDIR)/sw/inc/bitmaps.hlst \ $(SRCDIR)/vcl/inc/bitmaps.hlst \ $(SRCDIR)/xmlsecurity/inc/bitmaps.hlst - grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ + grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@.png + sed 's/\.png/\.svg/g' $@.png > $@.svg + cat $@.png $@.svg > $@ # commandimagelist.ilst and sorted.lst are phony to rebuild everything each time .PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst |