# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1273250176 -3600
# Node ID 71918f4840eda269d6b4ca27d9d6a23c66864a56
# Parent 164e587fef9f223befe193e5a22d91ac8de34746
fixups: tests for resource improvements
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/lib/flm/resource.flm
--- a/sbsv2/raptor/lib/flm/resource.flm Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm Fri May 07 17:36:16 2010 +0100
@@ -67,45 +67,6 @@
INTERBASE_TMP:=$(OUTPUTPATH)/$(TARGET_lower)_$(notdir $(basename $(SOURCE)))
INTERBASE:=$(OUTPUTPATH)/$(TARGET_lower)
-################################## localisation ###########################$(GNUMKDIR)#############
-# Only make copies for full resource builds
-
-# Initialise to prevent RELEASABLES spill-over between calls
-DESTRPP:=
-INFOFILE:=
-
-ifeq ($(HEADERONLY),)
-
-RSSBASENAME:=$(call lowercase,$(basename $(notdir $(SOURCE))))
-DESTRPP:=$(EPOCROOT)/epoc32/localisation/$(RSSBASENAME)/rsc/$(RSSBASENAME).rpp
-CREATABLEPATHS:=$(CREATABLEPATHS) $(EPOCROOT)/epoc32/localisation/$(RSSBASENAME)/rsc
-
-INFOFILE:=$(EPOCROOT)/epoc32/localisation/group/$(RSSBASENAME).info
-# If there are MULTIPLE languages then copy the .rpp for the last one
-RPPLANG:=$(lastword $(LANGUAGES:SC=sc))
-
-# Copy .rpp files from epoc32/build/ to epoc32/localisation/x/rsc/x.rpp and create .info files in localisation
-define CreateRppAndInfo
-
-ifeq ($(RESOURCE_$(call sanitise,$(SOURCE))),)
-RESOURCE_$(call sanitise,$(SOURCE)):=1
-
-RESOURCE:: $(INFOFILE)
-
-$(info $(DESTRPP))
-
-$(INFOFILE)::
- @if [ ! -d $(EPOCROOT)/epoc32/localisation/group ]; then $(GNUMKDIR) -p $(EPOCROOT)/epoc32/localisation/group; fi
- @if [ ! -f $$@ ]; then echo "DATADIR: /$(RSSBASENAME)" > $$@ ; fi
- @echo -e "\n/z$(TARGETPATH)/$(TARGET_lower).rsc : $(RSSBASENAME).rpp" >> $$@
-
-endif
-endef
-
-$(eval $(call CreateRppAndInfo))
-endif
-################################# end of localisation ###################################
-
# common pre-processor options
# We really should be using -iquote with a recent cpp. This is a note for when we do update:
@@ -186,7 +147,7 @@
$1.d: $(SOURCE)
$(call startrule,resourcedependencies,FORCESUCCESS) \
- RPP=$1; $(GNUCPP) -C -DLANGUAGE_$(3) -DLANGUAGE_$(subst sc,SC,$3) $(call makemacrodef,-D,$(MMPDEFS))\
+ RPP=$1; $(GNUCPP) -DLANGUAGE_$(3) -DLANGUAGE_$(subst sc,SC,$3) $(call makemacrodef,-D,$(MMPDEFS))\
$(CPPOPT) $(SOURCE) -M -MG -MT"$1" | \
$$(DEPENDENCY_CORRECTOR) >$$@ \
$(call endrule,resourcedependencies)
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py
--- a/sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py Fri May 07 17:36:16 2010 +0100
@@ -27,8 +27,8 @@
t.command = "sbs -b smoke_suite/test_resources/simple_gui/Bld.inf -c armv5 -c winscw"
t.addbuildtargets('smoke_suite/test_resources/simple_gui/Bld.inf', [
"helloworld_exe/helloworld.mbm_bmconvcommands",
- "helloworld_exe/helloworld_sc.rpp",
- "helloworld_exe/helloworld_sc.rpp.d",
+ "helloworld_exe/helloworld_HelloWorld_sc.rpp",
+ "helloworld_exe/helloworld_HelloWorld_sc.rpp.d",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o.d",
"helloworld_exe/armv5/udeb/HelloWorld_AppUi.o",
@@ -91,8 +91,8 @@
"helloworld_exe/winscw/urel/helloworld_UID_.o",
"helloworld_exe/winscw/urel/helloworld_UID_.o.d",
"helloworld_exe/winscw/urel/helloworld_urel_objects.lrf",
- "helloworld_reg_exe/helloworld_reg_sc.rpp",
- "helloworld_reg_exe/helloworld_reg_sc.rpp.d"
+ "helloworld_reg_exe/helloworld_reg_HelloWorld_reg_sc.rpp",
+ "helloworld_reg_exe/helloworld_reg_HelloWorld_reg_sc.rpp.d"
])
t.run()
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/test/smoke_suite/featurevariants.py
--- a/sbsv2/raptor/test/smoke_suite/featurevariants.py Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/featurevariants.py Fri May 07 17:36:16 2010 +0100
@@ -167,9 +167,8 @@
"createstaticdll_invariant_dll/armv5/urel/createstaticdll_invariant_urel_objects.via",
"createstaticdll_invariant_dll/armv5/urel/createstaticdll_invariant{000a0000}.def",
"createstaticdll_invariant_dll/armv5/urel/createstaticdll_invariant{000a0000}.dso",
-
- "dummy_inv_dll/dummy_inv_sc.rpp",
- "dummy_inv_dll/dummy_inv_sc.rpp.d"
+ "dummy_inv_dll/dummy_inv_dummy_sc.rpp",
+ "dummy_inv_dll/dummy_inv_dummy_sc.rpp.d"
]
variantBuildTargetsDefaultTree = [
@@ -293,12 +292,12 @@
]
variantBuildTargetsGeneric = [
- "dummy_var1_dll/dummy_var1_sc.rpp",
- "dummy_var1_dll/dummy_var1_sc.rpp.d",
- "dummy_var2_dll/dummy_var2_sc.rpp",
- "dummy_var2_dll/dummy_var2_sc.rpp.d",
- "dummy_var3_exe/dummy_var3_sc.rpp",
- "dummy_var3_exe/dummy_var3_sc.rpp.d"
+ "dummy_var1_dll/dummy_var1_dummy_sc.rpp",
+ "dummy_var1_dll/dummy_var1_dummy_sc.rpp.d",
+ "dummy_var2_dll/dummy_var2_dummy_sc.rpp",
+ "dummy_var2_dll/dummy_var2_dummy_sc.rpp.d",
+ "dummy_var3_exe/dummy_var3_dummy_sc.rpp",
+ "dummy_var3_exe/dummy_var3_dummy_sc.rpp.d"
]
sbscommand = "sbs -b smoke_suite/test_resources/bv/bld.inf -c armv5 " + \
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/test/smoke_suite/gui_whatlog.py
--- a/sbsv2/raptor/test/smoke_suite/gui_whatlog.py Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/gui_whatlog.py Fri May 07 17:36:16 2010 +0100
@@ -30,13 +30,10 @@
t.usebash = True
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/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/armv5/udeb/helloworld.exe",
@@ -49,8 +46,8 @@
]
t.addbuildtargets('smoke_suite/test_resources/simple_gui/Bld.inf', [
"helloworld_exe/helloworld.mbm_bmconvcommands",
- "helloworld_exe/helloworld_sc.rpp",
- "helloworld_exe/helloworld_sc.rpp.d",
+ "helloworld_exe/helloworld_HelloWorld_sc.rpp",
+ "helloworld_exe/helloworld_HelloWorld_sc.rpp.d",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o.d",
"helloworld_exe/armv5/udeb/HelloWorld_AppUi.o",
@@ -111,18 +108,14 @@
"helloworld_exe/winscw/urel/helloworld_UID_.dep",
"helloworld_exe/winscw/urel/helloworld_UID_.o",
"helloworld_exe/winscw/urel/helloworld_UID_.o.d",
- "helloworld_reg_exe/helloworld_reg_sc.rpp.d"
+ "helloworld_reg_exe/helloworld_reg_HelloWorld_reg_sc.rpp.d"
])
t.stdout = [
"",
"$(EPOCROOT)/epoc32/data/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/localisation/group/helloworld.info",
"$(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/armv5/udeb/helloworld.exe",
"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworld.exe.map",
"",
@@ -133,13 +126,9 @@
"$(EPOCROOT)/epoc32/data/z/resource/apps/helloworld.rsc",
"$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/apps/helloworld.rsc",
"$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/apps/helloworld.rsc",
- "$(EPOCROOT)/epoc32/localisation/helloworld/rsc/helloworld.rpp",
- "$(EPOCROOT)/epoc32/localisation/group/helloworld.info",
"$(EPOCROOT)/epoc32/data/z/private/10003a3f/apps/helloworld_reg.rsc",
"$(EPOCROOT)/epoc32/release/winscw/udeb/z/private/10003a3f/apps/helloworld_reg.rsc",
"$(EPOCROOT)/epoc32/release/winscw/urel/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/urel/helloworld.exe",
"$(EPOCROOT)/epoc32/release/winscw/urel/helloworld.exe.map",
"",
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/test/smoke_suite/timing.py
--- a/sbsv2/raptor/test/smoke_suite/timing.py Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/timing.py Fri May 07 17:36:16 2010 +0100
@@ -22,17 +22,6 @@
t.description = "Test that a timing log is created and contains total parse and build durations"
- t.id = "0103a"
- t.name = "timing_off"
- t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf -f-"
- t.mustnotmatch = [
- ".*progress:discovery.*",
- ".*progress:start.*",
- ".*progress:end.*"
- ]
- t.run()
-
-
t.id = "0103b"
t.name = "timing_on"
t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf --timing " + \
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/test/smoke_suite/whatlog_cache.py
--- a/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Fri May 07 17:36:16 2010 +0100
@@ -42,14 +42,11 @@
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/data/z/private/10003a3f/apps/helloworld_reg.rsc",
- "$(EPOCROOT)/epoc32/localisation/helloworld/rsc/helloworld.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",
@@ -134,10 +131,6 @@
[".*\'.*\\\\\\\\epoc32\\\\\\\\data\\\\\\\\z\\\\\\\\resource\\\\\\\\apps\\\\\\\\helloworld.mbm\'", 4],
[".*\'.*\\\\\\\\epoc32\\\\\\\\data\\\\\\\\z\\\\\\\\resource\\\\\\\\apps\\\\\\\\helloworld.rsc\'", 4],
[".*\'.*\\\\\\\\epoc32\\\\\\\\include\\\\\\\\helloworld.rsg\'", 4],
- [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\group\\\\\\\\helloworld.info\'", 4],
- [".*\'.*\\\\\\\\epoc32\\\\\\\\localisation\\\\\\\\group\\\\\\\\helloworld_reg.info\'", 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],
[".*\'.*\\\\\\\\epoc32\\\\\\\\release\\\\\\\\(armv5|winscw)\\\\\\\\(udeb|urel)\\\\\\\\helloworld.exe.map\'", 3],
[".*\'.*\\\\\\\\epoc32\\\\\\\\release\\\\\\\\winscw\\\\\\\\(udeb|urel)\\\\\\\\z\\\\\\\\private\\\\\\\\10003a3f\\\\\\\\apps\\\\\\\\helloworld_reg.rsc\'", 2],
diff -r 164e587fef9f -r 71918f4840ed sbsv2/raptor/test/smoke_suite/winscw_resource.py
--- a/sbsv2/raptor/test/smoke_suite/winscw_resource.py Wed May 05 20:59:20 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/winscw_resource.py Fri May 07 17:36:16 2010 +0100
@@ -30,9 +30,7 @@
"$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/testresource/testresource.r01",
"$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/testresource/testresource.r01",
"$(EPOCROOT)/epoc32/release/winscw/udeb/z/resource/testresource/testresource.rsc",
- "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/testresource/testresource.rsc",
- "$(EPOCROOT)/epoc32/localisation/group/testresource.info",
- "$(EPOCROOT)/epoc32/localisation/testresource/rsc/testresource.rpp"
+ "$(EPOCROOT)/epoc32/release/winscw/urel/z/resource/testresource/testresource.rsc"
]
t.run()
return t