# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1266926126 0
# Node ID 007900c31eef0363e705cf15d131740d4eeb6208
# Parent  1d008cd82fcf5e473b46e5af408648bcb283457e
version 2.12.3 (candidate 1)

diff -r 1d008cd82fcf -r 007900c31eef sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Thu Feb 18 15:00:04 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Tue Feb 23 11:55:26 2010 +0000
@@ -1,5 +1,11 @@
 Release Notes for Symbian Build System v2
 
+version 2.12.3
+
+Defect Fixes:
+- Don't print trace "what" information if we do not run the trace compiler.
+
+
 version 2.12.2
 
 Defect Fixes:
diff -r 1d008cd82fcf -r 007900c31eef sbsv2/raptor/lib/flm/tracecompiler.mk
--- a/sbsv2/raptor/lib/flm/tracecompiler.mk	Thu Feb 18 15:00:04 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue Feb 23 11:55:26 2010 +0000
@@ -25,8 +25,9 @@
 TRACE_PRJNAME:=$(TARGET)_$(TARGETTYPE)
 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)_TraceDefinitions.h
+# initialise (so what output will be correct if we don't actually run the TC)
+TRACE_DICTIONARY:=
+AUTOGEN_HEADER:=
 
 $(if $(FLMDEBUG),$(info <debug>TRACE_PATH = $(TRACE_PATH)</debug>))
 
@@ -52,6 +53,9 @@
 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
+
 JAVA_COMMAND:=$(SBS_JAVATC)
 TRACE_COMPILER_PATH:=$(EPOCROOT)/epoc32/tools
 TRACE_COMPILER_START:=-classpath $(TRACE_COMPILER_PATH)/tracecompiler com.nokia.tracecompiler.TraceCompiler
diff -r 1d008cd82fcf -r 007900c31eef sbsv2/raptor/python/raptor_version.py
--- a/sbsv2/raptor/python/raptor_version.py	Thu Feb 18 15:00:04 2010 +0000
+++ b/sbsv2/raptor/python/raptor_version.py	Tue Feb 23 11:55:26 2010 +0000
@@ -16,7 +16,7 @@
 
 # replace CHANGESET with the Hg changeset for ANY release
 
-version=(2,12,2,"2010-02-17","symbian build system","CHANGESET")
+version=(2,12,3,"2010-02-23","symbian build system","CHANGESET")
 
 def numericversion():
 	"""Raptor version string"""