# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1267698525 0
# Node ID fad68f1948078ae81080591134f7ef5cfcd086e7
# Parent  2257b1af191f718602953cd0055a2eb876f5e464# Parent  962ef461eccd28ce49f40ee8cf5180856f1b7e03
Merge

diff -r 2257b1af191f -r fad68f194807 sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Wed Mar 03 10:03:19 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Thu Mar 04 10:28:45 2010 +0000
@@ -1,5 +1,8 @@
 Release Notes for Symbian Build System v2
 
+next version
+- SF Bug 2125 - [Raptor] - tracecompiler what output incorrect if mmp basename contains '.' e.g. fred.prd.mmp 
+
 version 2.12.4
 
 Defect Fixes:
diff -r 2257b1af191f -r fad68f194807 sbsv2/raptor/lib/flm/tracecompiler.mk
--- a/sbsv2/raptor/lib/flm/tracecompiler.mk	Wed Mar 03 10:03:19 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk	Thu Mar 04 10:28:45 2010 +0000
@@ -72,8 +72,12 @@
 ifeq ($(GUARD_$(call sanitise,$(TRACE_MARKER))),)
 GUARD_$(call sanitise,$(TRACE_MARKER)):=1
 
-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)_TraceDefinitions.h
+# The trace compiler likes to change . into _ so we must do the same in the case of mmps with a name like
+# fred.prd.mmp we want fred_prd
+TRACE_PRJNAME_SANITISED:=$(subst .,_,$(TRACE_PRJNAME))
+
+TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME_SANITISED)_0x$(UID_TC)_Dictionary.xml
+AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME_SANITISED)_0x$(UID_TC)_TraceDefinitions.h
 
 JAVA_COMMAND:=$(SBS_JAVATC)
 TRACE_COMPILER_PATH:=$(EPOCROOT)/epoc32/tools
@@ -91,7 +95,8 @@
 	  echo -en "*ENDOFSOURCEFILES*\n" ) | \
 	$(JAVA_COMMAND) $(TRACE_COMPILER_START) $(UID_TC) &&  \
 	$(GNUMD5SUM) $(TRACE_SOURCE_LIST) > $(TRACE_MARKER) && \
-	{ $(GNUCAT) $(TRACE_SOURCE_LIST) ; true ; } \
+	{ $(GNUTOUCH) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER); \
+	 $(GNUCAT) $(TRACE_SOURCE_LIST) ; true ; } \
 	$(call endrule,tracecompile)
 endef
 
diff -r 2257b1af191f -r fad68f194807 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf	Wed Mar 03 10:03:19 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf	Thu Mar 04 10:28:45 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"
@@ -19,14 +19,6 @@
 
 /*
 *  You need tracecompiler to run this test.
-*
-*  If you run this test from Raptor test frame you need to zip your tracecompiler
-*  and put it under "$(SBS_HOME)/test/manual_tests/test_resources/" first, then Raptor will unzip it later. 
-*  This is because Raptor test frame removes tracecompiler from epoc32/tools/ at the very beginning, 
-*  so you have to export to put it "back there" again.
-*
-*  If you run this test NOT from Raptor test frame you do not need to do the above.
-*  Please just remove PRJ_EXPORTS and its contents below.    
 */
 
 PRJ_PLATFORMS
diff -r 2257b1af191f -r fad68f194807 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf	Thu Mar 04 10:28:45 2010 +0000
@@ -0,0 +1,28 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+
+/*
+*  You need tracecompiler to run this test.
+*/
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_MMPFILES
+test.TC.mmp
diff -r 2257b1af191f -r fad68f194807 sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/test.TC.mmp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/group/test.TC.mmp	Thu Mar 04 10:28:45 2010 +0000
@@ -0,0 +1,45 @@
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#include <platform_paths.hrh>
+
+TARGET          testTC.dll
+TARGETTYPE      dll
+UID             0x1000008d
+
+CAPABILITY      all
+
+DEFFILE         ../eabi/
+
+SOURCEPATH      ../src 
+SOURCE          wlanhwinit.cpp
+SOURCE          wlanhwinitmain.cpp
+SOURCE          wlanhwinitpermparser.cpp
+
+USERINCLUDE     ../inc
+USERINCLUDE     ../traces
+OS_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include/libc
+SYSTEMINCLUDE   /epoc32/include/internal
+SYSTEMINCLUDE   /epoc32/include/platform
+
+LIBRARY         euser.lib
+LIBRARY		iscapi.lib
+LIBRARY         isimessage.lib
+LIBRARY		efsrv.lib
+
diff -r 2257b1af191f -r fad68f194807 sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Wed Mar 03 10:03:19 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Thu Mar 04 10:28:45 2010 +0000
@@ -23,7 +23,7 @@
 	t.id = "112a"
 	t.name = "tracecompiler_whatlog_clean"
 	t.usebash = True
-	t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf -c armv5.tracecompiler CLEAN"
+	t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf -c armv5.tracecompiler CLEAN"
 	t.run("windows")
 
 	t = CheckWhatSmokeTest()
@@ -31,7 +31,7 @@
 	t.id = "112b"
 	t.name = "tracecompiler_whatlog"
 	t.usebash = True
-	t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf -c armv5.tracecompiler -m ${SBSMAKEFILE} -f ${SBSLOGFILE} && cat ${SBSLOGFILE}"
+	t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf -c armv5.tracecompiler -m ${SBSMAKEFILE} -f ${SBSLOGFILE} && cat ${SBSLOGFILE}"
 	t.hostossensitive = False
 	t.regexlinefilter = re.compile("^<(whatlog|export|build>|resource>|bitmap>)")
 	t.targets = [
@@ -47,12 +47,12 @@
 		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/wlanhwinitmainTraces.h",
 		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/wlanhwinitpermparserTraces.h",	
 		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/fixed_id.definitions",
-		"$(EPOCROOT)/epoc32/ost_dictionaries/testTC_0x1000008d_Dictionary.xml",
-		"$(EPOCROOT)/epoc32/include/internal/symbiantraces/autogen/testTC_0x1000008d_TraceDefinitions.h"
+		"$(EPOCROOT)/epoc32/ost_dictionaries/test_TC_0x1000008d_Dictionary.xml",
+		"$(EPOCROOT)/epoc32/include/internal/symbiantraces/autogen/test_TC_0x1000008d_TraceDefinitions.h"
 		]
 	t.stdout = [
-		"<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'>",
+		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/test.TC.mmp' config='armv5_urel.tracecompiler'>",
+		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/test.TC.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>",
@@ -61,8 +61,8 @@
 		"<build>$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll.map</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll.map</build>",
-		"<build>$(EPOCROOT)/epoc32/ost_dictionaries/testTC_0x1000008d_Dictionary.xml</build>",
-		"<build>$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/testTC_0x1000008d_TraceDefinitions.h</build>"
+		"<build>$(EPOCROOT)/epoc32/ost_dictionaries/test_TC_0x1000008d_Dictionary.xml</build>",
+		"<build>$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/test_TC_0x1000008d_TraceDefinitions.h</build>"
 		]		
 	t.run("windows")
 	t.id = "112"