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.
Removing references to local file system in tc_whatlog test fix
authorIain Williamson <iain.williamson@nokia.com>
Wed, 20 Jan 2010 11:10:34 +0000
branchfix
changeset 167 e400eed89539
parent 166 97aaf531ab6d
child 168 e0540a130417
Removing references to local file system in tc_whatlog test
sbsv2/raptor/lib/flm/tracecompiler.mk file | annotate | diff | comparison | revisions
sbsv2/raptor/lib/flm/win32.flm file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue Jan 19 19:50:03 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk	Wed Jan 20 11:10:34 2010 +0000
@@ -26,7 +26,7 @@
 endif
 
 TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME)_0x$(UID_TC)_Dictionary.xml
-AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_Traces.h
+AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_TraceDefinitions.h
 
 $(if $(FLMDEBUG),$(info <debug>TRACE_PATH = $(TRACE_PATH)</debug>))
 
--- a/sbsv2/raptor/lib/flm/win32.flm	Tue Jan 19 19:50:03 2010 +0000
+++ b/sbsv2/raptor/lib/flm/win32.flm	Wed Jan 20 11:10:34 2010 +0000
@@ -49,8 +49,8 @@
 LINKER_FIRSTSTATLIB:=
 MAINLINKAS:=
 NEWLIBFILE:=
-RELEASABLES:=
-TC_RELEASABLES:=
+RELEASEABLES:=
+TC_RELEASEABLES:=
 STATLIBDIR:=
 STDCPP_BUILD:=
 STDCPPTAGFILE:=
@@ -219,7 +219,7 @@
 # Users can turn TC on by setting it to 1 in user config.
 ifneq ($(USE_TRACE_COMPILER),) 
   include $(FLMHOME)/tracecompiler.mk
-  TC_RELEASABLES:=$(TRACE_DICTIONARY) $(AUTOGEN_HEADER)
+  TC_RELEASEABLES:=$(TRACE_DICTIONARY) $(AUTOGEN_HEADER)
 endif
 
 
@@ -252,7 +252,7 @@
 ifeq ($(SUPPORTS_IMPORT_LIBRARY),1)
   ifneq ($(NOEXPORTLIBRARY),1)
     ifneq ($(TARGET_$(call sanitise,$(IMPORTLIBTARGET))),1)
-      RELEASABLES:=$(RELEASABLES) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(IMPORTLIBTARGET))
+      RELEASEABLES:=$(RELEASEABLES) $(if $(or $(EXPORTUNFROZEN),$(DEFFILE)),$(IMPORTLIBTARGET))
 
       # import libraries are generated to the UDEB release directory
       ifneq ($(VARIANTTYPE),udeb)
@@ -298,7 +298,7 @@
     BINTARGETSTATICLINK:=$(BINDIRSTATICLINK)/$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(TARGETTYPE))
   endif
 
-  RELEASABLES:=$(RELEASABLES) $(BINTARGET) $(BINTARGETSTATICLINK)
+  RELEASEABLES:=$(RELEASEABLES) $(BINTARGET) $(BINTARGETSTATICLINK)
 
   # work on a local source files list
   SRCFILES:=$(SOURCE)
@@ -470,7 +470,7 @@
       # link map file (urel only)
       ifeq ($(VARIANTTYPE),urel)
         MAP:=$(OPT.MAP)$(BINTARGET).map
-        RELEASABLES:=$(RELEASABLES) $(BINTARGET).map
+        RELEASEABLES:=$(RELEASEABLES) $(BINTARGET).map
       endif
     endif
   endif
@@ -660,8 +660,8 @@
 
 # Global targets
 .PHONY:: $(ALLTARGET)
-$(ALLTARGET):: $(RELEASABLES)
-TARGET:: $(RELEASABLES)
+$(ALLTARGET):: $(RELEASEABLES)
+TARGET:: $(RELEASEABLES)
 
 ifeq ($(TARGET_$(call sanitise,$(IMPORTLIBTARGET))),1)
   LIBRARY:: $(IMPORTLIBTARGET)
@@ -682,7 +682,7 @@
   $(eval $(call MakeTestBatchFiles,$(TARGET),$(BATCHDIR)$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)))
   BATCHFILE_CREATED_$(BATCHDIR)$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH):=1
   TARGET_CREATED_$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)_$(TARGET):=1
-  RELEASABLES:=$(RELEASABLES) $(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)
+  RELEASEABLES:=$(RELEASEABLES) $(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TESTPATH)
 endif
 
 # clean up
@@ -690,4 +690,4 @@
 # make the output directories while reading makefile - some build engines prefer this
 $(call makepath,$(CREATABLEPATHS))
 # for the --what option and the log file
-$(call raptor_release,$(RELEASABLES) $(TC_RELEASABLES))
+$(call raptor_release,$(RELEASEABLES) $(TC_RELEASEABLES))
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Tue Jan 19 19:50:03 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Wed Jan 20 11:10:34 2010 +0000
@@ -43,8 +43,8 @@
 		"$(EPOCROOT)/epoc32/include/internal/symbiantraces/autogen/testTC_0x1000008d_TraceDefinitions.h"
 		]
 	t.stdout = [
-		"<whatlog bldinf='I:/team/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf' mmp='I:/team/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp' config='armv5_urel.tracecompiler'>",
-		"<whatlog bldinf='I:/team/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf' mmp='I:/team/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp' config='armv5_udeb.tracecompiler'>",
+		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp' config='armv5_urel.tracecompiler'>",
+		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp' config='armv5_udeb.tracecompiler'>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC.dso</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.dso</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib</build>",
FCL/sftools/dev/build