# HG changeset patch
# User Jon Chatten
# Date 1269245077 0
# Node ID 8c80a05c93b7144eba68d080223cf965a3f0857b
# Parent  cc1110af33a3141886d94588d4e944ea1bce4cf9# Parent  59ec73480ed35a4d0a2271aa21d13edd62af6342
Merge

diff -r 59ec73480ed3 -r 8c80a05c93b7 sbsv2/raptor/lib/config/msvc.xml
--- a/sbsv2/raptor/lib/config/msvc.xml	Thu Mar 18 14:00:53 2010 +0000
+++ b/sbsv2/raptor/lib/config/msvc.xml	Mon Mar 22 08:04:37 2010 +0000
@@ -32,7 +32,6 @@
 		<set name='OPT.NOLOGO' value='-nologo'/>
 		<set name='OPT.OBJECTFILE' value='-Fo'/>
 		<set name='OPT.OUTFILE' value='-out:'/>
-		<set name='OPT.PDBFILE' value='-Fd'/>
 		<set name='OPT.PREINCLUDE' value='-FI '/>
 		<set name='OPT.SUBSYSTEM' value='-subsystem:'/>
 		<set name='OPT.SYSINCLUDE' value='-I '/>
@@ -44,7 +43,7 @@
 		<set name='CDEFS.REL' value='NDEBUG'/>
 		<set name='CFLAGS' value='$(OPT.COMPILE) $(OPT.NOLOGO) -Zp4 -GF'/>
 		<set name='CFLAGS.DEFAULT.WARNLEVEL' value='-W4'/>
-		<set name='CFLAGS.DEB' value='-Zi -Od'/>
+		<set name='CFLAGS.DEB' value='-Od'/>
 		<set name='CFLAGS.REL' value='-O1 -Op'/>
 		<set name='SHAREDFLAGS' value='kernel32.lib $(OPT.NOLOGO) -machine:IX86  -ignore:4089 -ignore:4005 -ignore:4098'/>
 		<set name='LD' value='$(MS_LINK)'/>
diff -r 59ec73480ed3 -r 8c80a05c93b7 sbsv2/raptor/lib/flm/msvctools.flm
--- a/sbsv2/raptor/lib/flm/msvctools.flm	Thu Mar 18 14:00:53 2010 +0000
+++ b/sbsv2/raptor/lib/flm/msvctools.flm	Mon Mar 22 08:04:37 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-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"
@@ -28,7 +28,7 @@
 $(call makepath,$(RELEASEPATH))
 $(call makepath,$(BUILDPATH))
 
-RELEASEABLES:=$(RELEASEABLES) $(RELEASETARGET)
+RELEASABLES:=$(RELEASABLES) $(RELEASETARGET)
 
 GENDEBUGINFO:=$(if $(findstring deb,$(VARIANTTYPE)),1,)
 
@@ -58,10 +58,6 @@
 # macros
 DEFINES:=$(call makemacrodef,$(OPT.DEFINE),$(CDEFS) $(BASE_MACRO) $(CFLAGS.ADD))
 
-# other
-PDBFILE:=$(if $(GENDEBUGINFO),$(RELEASEPATH)/$(TARGET).pdb,)
-CLEANTARGETS:=$(CLEANTARGETS) $(PDBFILE)
-
 #compile
 define msvctoolscompile
   $(BUILDPATH)/$(basename $(notdir $(1))).obj: $(1) $(PROJECT_META) $(if $(HAVE_ORDERONLY),|,)  EXPORT
@@ -70,7 +66,6 @@
 	$(if $(findstring staticlib,$(BASE_TYPE)),,$(CFLAGS.LIB)) \
 	$(CFLAGS) $$(subst /,-,$(OPTION_MSVC)) \
 	$(if $(findstring /W,$(OPTION_MSVC)),,$(CFLAGS.DEFAULT.WARNLEVEL)) \
-	$(if $(PDBFILE),$$(call msvcformatarg,$(OPT.PDBFILE),$(PDBFILE)),) \
 	$(DEFINES) $(INCLUDES) \
 	$$(call msvcformatarg,$(OPT.BROWSEFILE),$(BUILDPATH)/$(basename $(notdir $(1))).sbr) \
 	$$(call msvcformatarg,$(OPT.OBJECTFILE),$$@) $(1) \
@@ -156,7 +151,7 @@
 
 ifneq ($(INSTALLPATH),)
   INSTALLTARGET:=$(INSTALLPATH)/$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(TARGETTYPE))
-  RELEASEABLES:=$(RELEASEABLES) $(INSTALLTARGET)
+  RELEASABLES:=$(RELEASABLES) $(INSTALLTARGET)
 
   define msvctoolsinstall
     $(INSTALLTARGET): $(RELEASETARGET)
@@ -179,7 +174,7 @@
   BSCFILE:=$(RELEASEPATH)/$(TARGET).bsc
   BSCRESPONSEFILE:=$(BUILDPATH)/$(TARGET).brf
   CLEANTARGETS:=$(CLEANTARGETS) $(BSCRESPONSEFILE)
-  RELEASEABLES:=$(RELEASEABLES) $(BSCFILE)
+  RELEASABLES:=$(RELEASABLES) $(BSCFILE)
 
   define msvctoolsgenbrowse  
     $(BSCFILE): $(OBJFILES)
@@ -197,8 +192,8 @@
 
 # Global targets
 .PHONY:: $(ALLTARGET)
-$(ALLTARGET):: $(RELEASEABLES)
-TARGET:: $(RELEASEABLES)
+$(ALLTARGET):: $(RELEASABLES)
+TARGET:: $(RELEASABLES)
 
 ifeq ($(BASE_TYPE),staticlib)
   LIBRARY:: $(RELEASETARGET) $(INSTALLTARGET)
diff -r 59ec73480ed3 -r 8c80a05c93b7 sbsv2/raptor/lib/flm/msvctools.xml
--- a/sbsv2/raptor/lib/flm/msvctools.xml	Thu Mar 18 14:00:53 2010 +0000
+++ b/sbsv2/raptor/lib/flm/msvctools.xml	Mon Mar 22 08:04:37 2010 +0000
@@ -42,7 +42,6 @@
 		<param name='OPT.LISTING'/>
 		<param name='OPT.OBJECTFILE'/>
 		<param name='OPT.OUTFILE'/>
-		<param name='OPT.PDBFILE'/>
 		<param name='OPT.PREINCLUDE'/>
 		<param name='OPT.SUBSYSTEM'/>
 		<param name='OPT.SYSINCLUDE'/>
diff -r 59ec73480ed3 -r 8c80a05c93b7 sbsv2/raptor/test/smoke_suite/tools.py
--- a/sbsv2/raptor/test/smoke_suite/tools.py	Thu Mar 18 14:00:53 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tools.py	Mon Mar 22 08:04:37 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"
@@ -20,19 +20,15 @@
 	t = SmokeTest()
 	t.id = "52"
 	t.name = "tools"
-	# Do not run with j > 1 because of known issues
-	t.command = "sbs -b smoke_suite/test_resources/tools/bld.inf -c tools -j1"
+	t.command = "sbs -b smoke_suite/test_resources/tools/bld.inf -c tools"
 	t.targets = [
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.bsc",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.exe",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.ilk",
-		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.pdb",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib1.bsc",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib1.lib",
-		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib1.pdb",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib2.bsc",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib2.lib",
-		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib2.pdb",
 		"$(EPOCROOT)/epoc32/release/tools/rel/tool_exe.exe",
 		"$(EPOCROOT)/epoc32/release/tools/rel/tool_lib1.lib",
 		"$(EPOCROOT)/epoc32/release/tools/rel/tool_lib2.lib",