# HG changeset patch # User Richard Taylor # Date 1267031285 0 # Node ID fbb0d47be429c05ba0a89d8dc5debe08979532b5 # Parent 6956be913ed6346fa47c275b847e56b3d475a927# Parent ac7e607c7d30842937e19b5ea4784b9b0817b6e3 catch up diff -r ac7e607c7d30 -r fbb0d47be429 sbsv2/raptor/lib/flm/bitmap.flm --- a/sbsv2/raptor/lib/flm/bitmap.flm Wed Feb 24 13:56:07 2010 +0000 +++ b/sbsv2/raptor/lib/flm/bitmap.flm Wed Feb 24 17:08:05 2010 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -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) diff -r ac7e607c7d30 -r fbb0d47be429 sbsv2/raptor/test/smoke_suite/bitmap.py --- a/sbsv2/raptor/test/smoke_suite/bitmap.py Wed Feb 24 13:56:07 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/bitmap.py Wed Feb 24 17:08:05 2010 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -26,13 +26,6 @@ t.targets = [ "$(EPOCROOT)/epoc32/include/testbitmap.mbg", "$(EPOCROOT)/epoc32/data/z/resource/apps/testbitmap.mBm", - "$(EPOCROOT)/epoc32/localisation/group/testbitmap.info", - "$(EPOCROOT)/epoc32/localisation/testbitmap/mbm/def2m.bmp", - "$(EPOCROOT)/epoc32/localisation/testbitmap/mbm/def3m.bmp", - "$(EPOCROOT)/epoc32/localisation/testbitmap/mbm/def4m.bmp", - "$(EPOCROOT)/epoc32/localisation/testbitmap/mbm/def24.bmp", - "$(EPOCROOT)/epoc32/localisation/testbitmap/mbm/def32.bmp", - "$(EPOCROOT)/epoc32/localisation/testbitmap/mbm/def48.bmp", "$(EPOCROOT)/epoc32/tools/makefile_templates/test/mifconv.xml", "$(EPOCROOT)/epoc32/tools/makefile_templates/test/mifconv.flm" ] diff -r ac7e607c7d30 -r fbb0d47be429 sbsv2/raptor/test/smoke_suite/gui_whatlog.py --- a/sbsv2/raptor/test/smoke_suite/gui_whatlog.py Wed Feb 24 13:56:07 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/gui_whatlog.py Wed Feb 24 17:08:05 2010 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -30,12 +30,6 @@ t.usebash = True t.targets = [ "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.mbm", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon24.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon2m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon32.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon3m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon48.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon4m.bmp", "$(EPOCROOT)/epoc32/localisation/group/helloworld.info", "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.mbm", "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.mbm", @@ -122,13 +116,6 @@ t.stdout = [ "", "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.mbm", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon24.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon2m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon32.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon3m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon48.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon4m.bmp", - "$(EPOCROOT)/epoc32/localisation/group/helloworld.info", "$(EPOCROOT)/epoc32/include/helloworld.rsg", "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.rsc", "$(EPOCROOT)/epoc32/localisation/helloworld/rsc/helloworld.rpp", @@ -142,13 +129,6 @@ "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.mbm", "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.mbm", "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.mbm", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon24.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon2m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon32.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon3m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon48.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon4m.bmp", - "$(EPOCROOT)/epoc32/localisation/group/helloworld.info", "$(EPOCROOT)/epoc32/include/helloworld.rsg", "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.rsc", "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.rsc", diff -r ac7e607c7d30 -r fbb0d47be429 sbsv2/raptor/test/smoke_suite/resource.py --- a/sbsv2/raptor/test/smoke_suite/resource.py Wed Feb 24 13:56:07 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/resource.py Wed Feb 24 17:08:05 2010 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -30,12 +30,6 @@ "$(EPOCROOT)/epoc32/localisation/testresource/rsc/testresource.rpp", "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.mbm", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon24.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon2m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon32.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon3m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon48.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon4m.bmp", "$(EPOCROOT)/epoc32/localisation/group/helloworld.info", "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.mbm", "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.mbm", diff -r ac7e607c7d30 -r fbb0d47be429 sbsv2/raptor/test/smoke_suite/sysdef_layers.py --- a/sbsv2/raptor/test/smoke_suite/sysdef_layers.py Wed Feb 24 13:56:07 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/sysdef_layers.py Wed Feb 24 17:08:05 2010 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -49,12 +49,6 @@ "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.rsc", "$(EPOCROOT)/epoc32/localisation/group/helloworld.info", "$(EPOCROOT)/epoc32/localisation/helloworld/rsc/helloworld.rpp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon2m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon3m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon4m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon24.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon32.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon48.bmp", "$(EPOCROOT)/epoc32/localisation/group/helloworld_reg.info", "$(EPOCROOT)/epoc32/localisation/helloworld_reg/rsc/helloworld_reg.rpp" ] diff -r ac7e607c7d30 -r fbb0d47be429 sbsv2/raptor/test/smoke_suite/whatlog_cache.py --- a/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Wed Feb 24 13:56:07 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Wed Feb 24 17:08:05 2010 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -42,12 +42,6 @@ t.targets = [ "$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.mbm", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon24.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon2m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon32.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon3m.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon48.bmp", - "$(EPOCROOT)/epoc32/localisation/helloworld/mbm/icon4m.bmp", "$(EPOCROOT)/epoc32/localisation/group/helloworld.info", "$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.mbm", "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.mbm", @@ -142,12 +136,6 @@ [".*\'.*\\\\\\\\epoc32\\\\\\\\include\\\\\\\\helloworld.rsg\'", 4], [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\group\\\\\\\\helloworld.info\'", 4], [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\group\\\\\\\\helloworld_reg.info\'", 4], - [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\mbm\\\\\\\\icon24.bmp\'", 4], - [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\mbm\\\\\\\\icon2m.bmp\'", 4], - [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\mbm\\\\\\\\icon32.bmp\'", 4], - [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\mbm\\\\\\\\icon3m.bmp\'", 4], - [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\mbm\\\\\\\\icon48.bmp\'", 4], - [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\mbm\\\\\\\\icon4m.bmp\'", 4], [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld\\\\\\\\rsc\\\\\\\\helloworld.rpp\'", 4], [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\helloworld_reg\\\\\\\\rsc\\\\\\\\helloworld_reg.rpp\'", 4], [".*\'.*\\\\\\\\epoc32\\\\\\\\release\\\\\\\\(armv5|winscw)\\\\\\\\(udeb|urel)\\\\\\\\helloworld.exe\'",4],