summaryrefslogtreecommitdiff
path: root/packimages
diff options
context:
space:
mode:
authorAriel Constenla-Haile <arielch@apache.org>2012-05-25 09:20:36 +0000
committerAriel Constenla-Haile <arielch@apache.org>2012-05-25 09:20:36 +0000
commit9e8e293779e70490130127d8d14e4afea247e2bb (patch)
treee94b53e8d12fbc7e7d61ad003f18146d96f32c5a /packimages
parentc71c09b5c6496c5899ad12091934d47faba66624 (diff)
Make packimages verbose
Notes
ignore: obsolete
Diffstat (limited to 'packimages')
-rw-r--r--packimages/pack/makefile.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index 31ccddb92cc9..584873b01889 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -30,6 +30,15 @@ TARGET=packimages
RSCCUSTOMIMG*=$(PRJ)
.INCLUDE: target.mk
+
+.IF "$(VERBOSE_PACKIMG)"=="TRUE"
+VERBOSESWITCH=-vv
+.ELIF "$(VERBOSE)"=="TRUE"
+VERBOSESWITCH=-v
+.ELSE
+VERBOSESWITCH=
+.ENDIF
+
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
@@ -54,10 +63,10 @@ $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
$(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl $(VERBOSESWITCH) -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
images_% : $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl $(VERBOSESWITCH) -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip: