Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix a resource copy problem (not copying when multiple copies required) that showed up in the tests. fix
authortimothy.murphy@nokia.com
Mon, 10 May 2010 13:31:44 +0100
branchfix
changeset 539 cbc9d85d999d
parent 538 71918f4840ed
child 540 3ce13bc3e630
fix a resource copy problem (not copying when multiple copies required) that showed up in the tests.
sbsv2/raptor/lib/flm/resource.flm file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/resource.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/sysdef_layers.py file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/lib/flm/resource.flm	Fri May 07 17:36:16 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Mon May 10 13:31:44 2010 +0100
@@ -112,7 +112,7 @@
     # It allows resources to be built in the right order but doesn't impose the weight of
     # of full dependency information which can overwhelm make in large builds.
     # The strategy is filter lines which don't have .rsg or 
-    # .mbg dependencies in them and if to sift eah line to leave out non-relevant things like
+    # .mbg dependencies in them and if to sift each line to leave out non-relevant things like
     # other header files, .hrh files etc.  In the end we don't print anything at all if we
     # did not find the target.
 
@@ -192,7 +192,7 @@
 
    RELEASABLES:=$$(RELEASABLES) $(2)
 
-   $(if $(TARGET_$(call sanitise,$(firstword $2))),,$(eval TARGET_$(call sanitise,$(firstword $2)):=1)$(info <copy source='$1'>$2</copy>))
+   $(info <copy source='$1'>$(foreach T,$2,$(if $(TARGET_$(call sanitise,$(T))),,$(T)$(eval TARGET_$(call sanitise,$(firstword $2)):=1)))</copy>)
  
 endef # copyresource #
 
--- a/sbsv2/raptor/test/smoke_suite/resource.py	Fri May 07 17:36:16 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/resource.py	Mon May 10 13:31:44 2010 +0100
@@ -25,15 +25,11 @@
 	t.command = "sbs  -b smoke_suite/test_resources/simple_gui/Bld.inf RESOURCE"
 	t.targets = [
 		"$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.mbm",
-		"$(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",
 		"$(EPOCROOT)/epoc32/include/helloworld.rsg",
 		"$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.rsc",
-		"$(EPOCROOT)/epoc32/localisation/helloworld/rsc/helloworld.rpp",
 		"$(EPOCROOT)/epoc32/data/z/private/10003a3f/apps/helloworld_reg.rsc",
-		"$(EPOCROOT)/epoc32/localisation/helloworld_reg/rsc/helloworld_reg.rpp",
-		"$(EPOCROOT)/epoc32/localisation/group/helloworld_reg.info",
 		"$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.rsc",
 		"$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.rsc",
 		"$(EPOCROOT)/epoc32/release/winscw/udeb/z/private/10003a3f/apps/helloworld_reg.rsc",
@@ -72,8 +68,6 @@
 		"$(EPOCROOT)/epoc32/data/z/resource/testresource/testresource.r01",
 		"$(EPOCROOT)/epoc32/data/z/resource/testresource/testresource.rsc",
 		"$(EPOCROOT)/epoc32/release/armv5/urel/testresource.exe",
-		"$(EPOCROOT)/epoc32/localisation/group/testresource.info",
-		"$(EPOCROOT)/epoc32/localisation/testresource/rsc/testresource.rpp",
 		res_depfile
 		]
 
--- a/sbsv2/raptor/test/smoke_suite/sysdef_layers.py	Fri May 07 17:36:16 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/sysdef_layers.py	Mon May 10 13:31:44 2010 +0100
@@ -46,13 +46,9 @@
 		"$(EPOCROOT)/epoc32/release/winscw/urel/helloworld.exe.map",
 		"$(EPOCROOT)/epoc32/release/winscw/urel/z/private/10003a3f/apps/helloworld_reg.rsc",
 		"$(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/group/helloworld_reg.info",
-		"$(EPOCROOT)/epoc32/localisation/helloworld_reg/rsc/helloworld_reg.rpp"
 		]
 	t.addbuildtargets('smoke_suite/test_resources/sysdef/build_gen_source/bld.inf', [
-		"helloworld_/helloworld_sc.rpp"
+		"helloworld_/helloworld_HelloWorld_sc.rpp"
 		])
 	t.addbuildtargets('smoke_suite/test_resources/sysdef/dependent/bld.inf', [
 		"helloworld_exe/armv5/udeb/HelloWorld_Application.o",
@@ -79,11 +75,11 @@
 		"helloworld_exe/winscw/urel/HelloWorld_Main.o",
 		"helloworld_exe/winscw/urel/helloworld.UID.CPP",
 		"helloworld_exe/winscw/urel/helloworld_UID_.o",
-		"helloworld_reg_exe/helloworld_reg_sc.rpp"
+		"helloworld_reg_exe/helloworld_reg_HelloWorld_reg_sc.rpp"
 		])
 	t.countmatch = [
-		["<recipe .*layer='Component with Layer Dependencies' component='dependent'.*>", 35],
-		["<recipe .*layer='Build Generated Source' component='build generated source'.*>", 5]		
+		["<recipe .*layer='Component with Layer Dependencies' component='dependent'.*>", 34],
+		["<recipe .*layer='Build Generated Source' component='build generated source'.*>", 4]		
 		]
 	t.run()
 	return t
FCL/sftools/dev/build