# HG changeset patch # User Richard Taylor # Date 1266940669 0 # Node ID 634a95a81cec3c9d5ed0f1f5bc87caf5b94fc0d4 # Parent 8426d4dedf84939a791558af954dba1862d73ce5 remove redundant bmp file copying diff -r 8426d4dedf84 -r 634a95a81cec sbsv2/raptor/lib/flm/bitmap.flm --- a/sbsv2/raptor/lib/flm/bitmap.flm Tue Feb 23 14:22:19 2010 +0000 +++ b/sbsv2/raptor/lib/flm/bitmap.flm Tue Feb 23 15:57:49 2010 +0000 @@ -118,54 +118,6 @@ $(eval $(call copybitmap)) endif -################################### localisation ######################################### -## copy .bmp files to localisation - -# $(BMPFILES) is a list of bmp files in src -BMPFILES:=$(subst FILE=,,$(filter FILE=%,$(SOURCE))) -BMBASENAME:=$(call lowercase,$(basename $(BMTARGET))) -BMPCOPYFILES:= -BMPCOPYDIR:=$(EPOCROOT)/epoc32/localisation/$(BMBASENAME)/mbm -$(call makepath,$(BMPCOPYDIR)) - -define copyBMP -# $(1) is the source .bmp file -# $(2) is the (lower cased) copy in localisation - -ifneq ($(BINCOPYDIRS),) -BITMAP:: $(2) - -$(2): $(1) - $(call startrule,bmpfilecopy,FORCESUCCESS) \ - $(GNUCP) $(1) $(2) && $(GNUCHMOD) +rw $(2) \ - $(call endrule,bmpfilecopy) - -endif - -BMPCOPYFILES:=$$(BMPCOPYFILES) $(2) -endef - -$(foreach BMP,$(BMPFILES),$(eval $(call copyBMP,$(BMP),$(BMPCOPYDIR)/$(call lowercase,$(notdir $(BMP)))))) - -## create and edit info files for bitmap files in localisation/group -INFOFILE:=$(EPOCROOT)/epoc32/localisation/group/$(BMBASENAME).info -DEPTH:=$(subst DEPTH=,,$(filter DEPTH=%,$(SOURCE))) -BMP:=$(notdir $(BMPFILES)) -DEPTHBMP:=$(subst _,\,$(join $(patsubst %,/%,$(DEPTH)),$(patsubst %,_%,$(BMP)))) - -define bmpInfo - -BITMAP::$(INFOFILE) - -$(INFOFILE):: - @if [ ! -d $(EPOCROOT)/epoc32/localisation/group ]; then $(GNUMKDIR) -p $(EPOCROOT)/epoc32/localisation/group; fi - @if [ ! -f $$@ ]; then echo "DATADIR: /$(BMBASENAME)" > $$@ ; fi - @echo -e "\n/z$(TARGETPATH)/$(BMTARGET) : $(DEPTHBMP)" >> $$@ -endef - -$(eval $(call bmpInfo)) - -# end of localisation ######################################################### ## Clean up $(call raptor_clean,$(CLEANTARGETS)) @@ -173,6 +125,6 @@ $(call makepathfor,$(BITMAPHEADER)) # for the abld -what target -BMPRELEASEABLES:=$(RELEASEABLES) $(MBMCOPYFILES) $(BMPCOPYFILES) $(INFOFILE) +BMPRELEASEABLES:=$(RELEASEABLES) $(MBMCOPYFILES) $(call raptor_release,$(BMPRELEASEABLES),BITMAP)