--- a/sbsv2/raptor/bin/sbs.bat Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/bin/sbs.bat Mon Nov 30 18:04:21 2009 +0000
@@ -31,6 +31,8 @@
@REM Use the python set by the environment if possible
@SET __PYTHON__=%SBS_PYTHON%
@IF "%__PYTHON__%"=="" SET __PYTHON__=%SBS_HOME%\win32\python252\python.exe
+@SET PYTHONPATH=%SBS_PYTHONPATH%
+@IF "%PYTHONPATH%"=="" SET PYTHONPATH=%SBS_HOME%\win32\python252
@REM Use the mingw set by the environment if possible
@SET __MINGW__=%SBS_MINGW%
--- a/sbsv2/raptor/python/plugins/filter_checksource.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_checksource.py Mon Nov 30 18:04:21 2009 +0000
@@ -221,14 +221,14 @@
# so we only check each one once
depset = set(deps)
deplistnodups = list(depset)
-
# Do the check for each file
+
for dep in deplistnodups:
- dep = os.path.normpath(dep).replace('\\', '/')
+ dep = os.path.abspath(dep).replace('\\', '/')
self.checksource(dep)
except Exception, e:
- sys.stderr.write("sbs: could not access temporary file for FilterClean\n")
+ sys.stderr.write("sbs: FilterCheckSource failed: %s\n" % str(e))
if self.errors == 0:
sys.stdout.write("No checksource errors found\n")
@@ -263,7 +263,7 @@
def checkcase(self, path):
"""Checks the path matches the file system"""
- path = os.path.normpath(path)
+ path = os.path.abspath(path)
path = path.replace('\\', '/')
if not os.path.exists(path):
@@ -277,7 +277,7 @@
for part in parts:
if not self.checkkeyignorecase(cacheItem, part):
-
+
dirItems = os.listdir(dirBeingChecked)
found = False
--- a/sbsv2/raptor/python/plugins/filter_clean.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_clean.py Mon Nov 30 18:04:21 2009 +0000
@@ -93,8 +93,8 @@
dirs.add(directory)
self.tmp.close() # this also deletes the temporary file
- except:
- sys.stderr.write("sbs: could not access temporary file for FilterClean\n")
+ except Exception,e:
+ sys.stderr.write("sbs: problem reading temporary file for FilterClean: %s\n" % str(e))
self.ok = False
# finally remove (empty) directories
--- a/sbsv2/raptor/test/common/raptor_tests.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/common/raptor_tests.py Mon Nov 30 18:04:21 2009 +0000
@@ -121,36 +121,42 @@
This method walks through epocroot and cleans every file and folder that is
not present in the manifest file
"""
- print "Cleaning Epocroot..."
+ epocroot = os.path.abspath(os.environ['EPOCROOT']).replace('\\','/')
+ print "Cleaning Epocroot: %s" % epocroot
all_files = {} # dictionary to hold all files
folders = [] # holds all unique folders in manifest
host_platform = os.environ["HOSTPLATFORM_DIR"]
try:
- mani = "./epocroot/manifest"
+ mani = "$(EPOCROOT)/manifest"
manifest = open(ReplaceEnvs(mani), "r")
+ le = len(epocroot)
for line in manifest:
line = line.replace("$(HOSTPLATFORM_DIR)", host_platform)
+ line = line.replace("./", epocroot+"/").rstrip("\n")
# Get rid of newline char and add to dictionary
- all_files[line.rstrip("\n")] = True
+ all_files[line] = True
# This bit makes a record of unique folders into a list
- end = 0
- while end != -1: # Look through the parent folders
- end = line.rfind("/")
- line = line[:end]
- if line not in folders:
- folders.append(line)
+ pos = line.rfind("/", le)
+ while pos > le: # Look through the parent folders
+ f = line[:pos]
+ if f not in folders:
+ folders.append(f)
+ pos = line.rfind("/", le, pos)
+
+
# This algorithm walks through epocroot and handles files and folders
- walkpath = "./epocroot"
+ walkpath = "$(EPOCROOT)"
for (root, dirs, files) in os.walk(ReplaceEnvs(walkpath), topdown =
False):
+ if root.find(".hg") != -1:
+ continue
+
# This loop handles all files
for name in files:
name = os.path.join(root, name).replace("\\", "/")
- name = name.replace("./epocroot/", "./")
if name not in all_files:
try:
- name = ReplaceEnvs(name.replace("./", "./epocroot/"))
os.remove(name)
except:
# chmod to rw and try again
@@ -166,11 +172,10 @@
# This loop handles folders
for name in dirs:
name = os.path.join(root, name).replace("\\", "/")
- name = name.replace("./epocroot/", "./")
if name not in all_files and name not in folders:
# Remove the folder fully with no errors if full
try:
- rmtree(ReplaceEnvs(name.replace("./", "./epocroot/")))
+ rmtree(ReplaceEnvs(name))
except:
print "\nEPOCROOT-CLEAN ERROR:"
print (sys.exc_type.__name__ + ":"), \
--- a/sbsv2/raptor/test/smoke_suite/exe_checksource.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/exe_checksource.py Mon Nov 30 18:04:21 2009 +0000
@@ -14,6 +14,10 @@
# Description:
#
+# NB - the checksource filter can find the same problem twice
+# So the count of 5 errors here is not actually accurate (AFAIK there are only 4)
+
+
from raptor_tests import SmokeTest
def run():
@@ -30,7 +34,7 @@
t.command = cmd1 + " && " + cmd2 + " && " + cmd3
t.mustmatch = [
- ".* 6 checksource errors found.*"
+ ".* 5 checksource errors found.*"
]
t.returncode = 1
t.run("windows")
--- a/sbsv2/raptor/test/smoke_suite/featurevariants.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/featurevariants.py Mon Nov 30 18:04:21 2009 +0000
@@ -231,7 +231,7 @@
vmap = " -o " + vmapfile
if 'SBS_BVCPP' in os.environ:
- bvcpp = " -c " + os.environ['SBS_BVCPP']
+ bvcpp = " -c " + os.environ['SBS_BVCPP'].replace('\\','/')
else:
bvcpp = " -c $(SBS_HOME)/$(HOSTPLATFORM_DIR)/bv/bin/cpp"
if t.onWindows:
--- a/sbsv2/raptor/test/smoke_suite/gnumakefile.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/gnumakefile.py Mon Nov 30 18:04:21 2009 +0000
@@ -25,7 +25,7 @@
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_ARMV5_UDEB.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_ARMV5_UREL.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_WINSCW_UDEB.txt",
- "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_WINSCW_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_WINSCW_UREL.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_final_ARMV5_UDEB.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_final_ARMV5_UREL.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_final_WINSCW_UDEB.txt",
@@ -41,7 +41,27 @@
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_ARMV5_UDEB.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_ARMV5_UREL.txt",
"$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_WINSCW_UDEB.txt",
- "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_WINSCW_UREL.txt"
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_WINSCW_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_ARMV5_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_ARMV5_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_WINSCW_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_WINSCW_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_ARMV5_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_ARMV5_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_WINSCW_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_WINSCW_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_ARMV5_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_ARMV5_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_WINSCW_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_WINSCW_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_ARMV5_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_ARMV5_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_WINSCW_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_WINSCW_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_ARMV5_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_ARMV5_UREL.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_WINSCW_UDEB.txt",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_WINSCW_UREL.txt"
]
t.run("windows") # we don't have make 3.79 on Linux
return t
--- a/sbsv2/raptor/test/smoke_suite/gnumakefile_what.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/gnumakefile_what.py Mon Nov 30 18:04:21 2009 +0000
@@ -45,7 +45,27 @@
componentpath+"/master_resource_ARMV5_UDEB.txt",
componentpath+"/master_resource_ARMV5_UREL.txt",
componentpath+"/master_resource_WINSCW_UDEB.txt",
- componentpath+"/master_resource_WINSCW_UREL.txt"
+ componentpath+"/master_resource_WINSCW_UREL.txt",
+ componentpath+"/slave_bld_ARMV5_UDEB.txt",
+ componentpath+"/slave_bld_ARMV5_UREL.txt",
+ componentpath+"/slave_bld_WINSCW_UDEB.txt",
+ componentpath+"/slave_bld_WINSCW_UREL.txt",
+ componentpath+"/slave_final_ARMV5_UDEB.txt",
+ componentpath+"/slave_final_ARMV5_UREL.txt",
+ componentpath+"/slave_final_WINSCW_UDEB.txt",
+ componentpath+"/slave_final_WINSCW_UREL.txt",
+ componentpath+"/slave_lib_ARMV5_UDEB.txt",
+ componentpath+"/slave_lib_ARMV5_UREL.txt",
+ componentpath+"/slave_lib_WINSCW_UDEB.txt",
+ componentpath+"/slave_lib_WINSCW_UREL.txt",
+ componentpath+"/slave_makmake_ARMV5_UDEB.txt",
+ componentpath+"/slave_makmake_ARMV5_UREL.txt",
+ componentpath+"/slave_makmake_WINSCW_UDEB.txt",
+ componentpath+"/slave_makmake_WINSCW_UREL.txt",
+ componentpath+"/slave_resource_ARMV5_UDEB.txt",
+ componentpath+"/slave_resource_ARMV5_UREL.txt",
+ componentpath+"/slave_resource_WINSCW_UDEB.txt",
+ componentpath+"/slave_resource_WINSCW_UREL.txt"
]
t.run("windows") # we don't have make 3.79 on Linux
return t
--- a/sbsv2/raptor/test/smoke_suite/gnumakefile_whatlog.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/gnumakefile_whatlog.py Mon Nov 30 18:04:21 2009 +0000
@@ -47,7 +47,27 @@
componentpath+"/master_resource_ARMV5_UDEB.txt",
componentpath+"/master_resource_ARMV5_UREL.txt",
componentpath+"/master_resource_WINSCW_UDEB.txt",
- componentpath+"/master_resource_WINSCW_UREL.txt"
+ componentpath+"/master_resource_WINSCW_UREL.txt",
+ componentpath+"/slave_bld_ARMV5_UDEB.txt",
+ componentpath+"/slave_bld_ARMV5_UREL.txt",
+ componentpath+"/slave_bld_WINSCW_UDEB.txt",
+ componentpath+"/slave_bld_WINSCW_UREL.txt",
+ componentpath+"/slave_final_ARMV5_UDEB.txt",
+ componentpath+"/slave_final_ARMV5_UREL.txt",
+ componentpath+"/slave_final_WINSCW_UDEB.txt",
+ componentpath+"/slave_final_WINSCW_UREL.txt",
+ componentpath+"/slave_lib_ARMV5_UDEB.txt",
+ componentpath+"/slave_lib_ARMV5_UREL.txt",
+ componentpath+"/slave_lib_WINSCW_UDEB.txt",
+ componentpath+"/slave_lib_WINSCW_UREL.txt",
+ componentpath+"/slave_makmake_ARMV5_UDEB.txt",
+ componentpath+"/slave_makmake_ARMV5_UREL.txt",
+ componentpath+"/slave_makmake_WINSCW_UDEB.txt",
+ componentpath+"/slave_makmake_WINSCW_UREL.txt",
+ componentpath+"/slave_resource_ARMV5_UDEB.txt",
+ componentpath+"/slave_resource_ARMV5_UREL.txt",
+ componentpath+"/slave_resource_WINSCW_UDEB.txt",
+ componentpath+"/slave_resource_WINSCW_UREL.txt"
]
t.stdout = [
"<whatlog bldinf='"+componentpath+"/bld.inf' mmp='' config='armv5_udeb.whatlog'>",
@@ -73,7 +93,31 @@
"<build>"+componentpath+"/master_final_WINSCW_UDEB.txt</build>",
"<build>"+componentpath+"/master_lib_WINSCW_UDEB.txt</build>",
"<build>"+componentpath+"/master_makmake_WINSCW_UDEB.txt</build>",
- "<build>"+componentpath+"/master_resource_WINSCW_UDEB.txt</build>"
+ "<build>"+componentpath+"/master_resource_WINSCW_UDEB.txt</build>",
+ "<whatlog bldinf='"+componentpath+"/bld.inf' mmp='' config='armv5_udeb.whatlog'>",
+ "<build>"+componentpath+"/slave_bld_ARMV5_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_final_ARMV5_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_lib_ARMV5_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_makmake_ARMV5_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_resource_ARMV5_UDEB.txt</build>",
+ "<whatlog bldinf='"+componentpath+"/bld.inf' mmp='' config='armv5_urel.whatlog'>",
+ "<build>"+componentpath+"/slave_bld_ARMV5_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_final_ARMV5_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_lib_ARMV5_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_makmake_ARMV5_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_resource_ARMV5_UREL.txt</build>",
+ "<whatlog bldinf='"+componentpath+"/bld.inf' mmp='' config='winscw_urel.whatlog'>",
+ "<build>"+componentpath+"/slave_bld_WINSCW_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_final_WINSCW_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_lib_WINSCW_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_makmake_WINSCW_UREL.txt</build>",
+ "<build>"+componentpath+"/slave_resource_WINSCW_UREL.txt</build>",
+ "<whatlog bldinf='"+componentpath+"/bld.inf' mmp='' config='winscw_udeb.whatlog'>",
+ "<build>"+componentpath+"/slave_bld_WINSCW_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_final_WINSCW_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_lib_WINSCW_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_makmake_WINSCW_UDEB.txt</build>",
+ "<build>"+componentpath+"/slave_resource_WINSCW_UDEB.txt</build>"
]
t.run("windows") # we don't have make 3.79 on Linux
return t
--- a/sbsv2/raptor/test/smoke_suite/longpath.py Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/longpath.py Mon Nov 30 18:04:21 2009 +0000
@@ -74,14 +74,12 @@
e32def = dirname + 'e32def.h'
deftestu = dirname + 'deftestu.def'
- distpol = dirname + 'distribution.policy.s60'
dst_cpp = sbsHome + path + 'test.cpp'
dst_bld = sbsHome + path + 'bld.inf'
dst_deftest = sbsHome + path + 'deftest.mmp'
dst_e32def = sbsHome + path + 'e32def.h'
dst_deftestu = sbsHome + path_eabi + 'deftestu.def'
- dst_distpol = sbsHome + path_eabi + 'distribution.policy.s60'
if os.path.exists(dst_cpp):
@@ -92,7 +90,6 @@
shutil.copy(deftest, dst_deftest)
shutil.copy(e32def, dst_e32def)
shutil.copy(deftestu , dst_deftestu)
- shutil.copy(distpol , dst_distpol)
dirname = sbsHome + path
t = SmokeTest()
--- a/sbsv2/raptor/test/smoke_suite/test_resources/gnumakefile/slave.mak Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/gnumakefile/slave.mak Mon Nov 30 18:04:21 2009 +0000
@@ -9,34 +9,34 @@
MAKMAKE :
- echo SLAVE.MAK MAKMAKE >> master_makmake_$(PLATFORM)_$(CFG).txt
+ echo SLAVE.MAK MAKMAKE > slave_makmake_$(PLATFORM)_$(CFG).txt
RESOURCE :
- echo SLAVE.MAK RESOURCE >> master_resource_$(PLATFORM)_$(CFG).txt
+ echo SLAVE.MAK RESOURCE > slave_resource_$(PLATFORM)_$(CFG).txt
SAVESPACE : BLD
BLD :
- echo SLAVE.MAK BLD >> master_bld_$(PLATFORM)_$(CFG).txt
+ echo SLAVE.MAK BLD > slave_bld_$(PLATFORM)_$(CFG).txt
FREEZE :
- echo SLAVE.MAK FREEZE >> master_freeze_$(PLATFORM)_$(CFG).txt
+ echo SLAVE.MAK FREEZE > slave_freeze_$(PLATFORM)_$(CFG).txt
LIB :
- echo SLAVE.MAK LIB >> master_lib_$(PLATFORM)_$(CFG).txt
+ echo SLAVE.MAK LIB > slave_lib_$(PLATFORM)_$(CFG).txt
CLEANLIB : do_nothing
FINAL :
- echo SLAVE.MAK FINAL >> master_final_$(PLATFORM)_$(CFG).txt
+ echo SLAVE.MAK FINAL >> slave_final_$(PLATFORM)_$(CFG).txt
CLEAN :
rm -f *.txt
RELEASABLES :
- @echo $(DIRECTORY)/master_makmake_$(PLATFORM)_$(CFG).txt
- @echo $(DIRECTORY)/master_resource_$(PLATFORM)_$(CFG).txt
- @echo $(DIRECTORY)/master_bld_$(PLATFORM)_$(CFG).txt
- @echo $(DIRECTORY)/master_lib_$(PLATFORM)_$(CFG).txt
- @echo $(DIRECTORY)/master_final_$(PLATFORM)_$(CFG).txt
+ @echo $(DIRECTORY)/slave_makmake_$(PLATFORM)_$(CFG).txt
+ @echo $(DIRECTORY)/slave_resource_$(PLATFORM)_$(CFG).txt
+ @echo $(DIRECTORY)/slave_bld_$(PLATFORM)_$(CFG).txt
+ @echo $(DIRECTORY)/slave_lib_$(PLATFORM)_$(CFG).txt
+ @echo $(DIRECTORY)/slave_final_$(PLATFORM)_$(CFG).txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/bld.inf Mon Nov 30 18:04:21 2009 +0000
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+PRJ_PLATFORMS
+ARMV5 WINSCW
+
+PRJ_MMPFILES
+macros.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/macros.cpp Mon Nov 30 18:04:21 2009 +0000
@@ -0,0 +1,71 @@
+/*
+* Copyright (c) 2009 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 "e32def.h"
+
+TInt E32Main()
+ {
+
+// Confirm macro presence in processing through warnings
+
+#ifdef __ARMCC__
+#warning __ARMCC__
+#endif
+
+#ifdef __ARMCC_2__
+#warning __ARMCC_2__
+#endif
+
+#ifdef __ARMCC_2_2__
+#warning __ARMCC_2_2__
+#endif
+
+#ifdef __ARMCC_3__
+#warning __ARMCC_3__
+#endif
+
+#ifdef __ARMCC_3_1__
+#warning __ARMCC_3_1__
+#endif
+
+#ifdef __ARMCC_4__
+#warning __ARMCC_4__
+#endif
+
+#ifdef __ARMCC_4_0__
+#warning __ARMCC_4_0__
+#endif
+
+#ifdef __GCCE__
+#warning __GCCE__
+#endif
+
+#ifdef __GCCE_4__
+#warning __GCCE_4__
+#endif
+
+#ifdef __GCCE_4_3__
+#warning __GCCE_4_3__
+#endif
+
+#ifdef __GCCE_4_4__
+#warning __GCCE_4_4__
+#endif
+
+ return 0;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/macros.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -0,0 +1,70 @@
+/*
+* Copyright (c) 2009 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:
+*
+*/
+
+
+TARGET macros
+TARGETTYPE EXE
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SYSTEMINCLUDE /epoc32/include
+SOURCE macros.cpp
+
+// Confirm macro presence in processing through warnings
+
+#ifdef ARMCC
+#warning ARMCC
+#endif
+
+#ifdef ARMCC_2
+#warning ARMCC_2
+#endif
+
+#ifdef ARMCC_2_2
+#warning ARMCC_2_2
+#endif
+
+#ifdef ARMCC_3
+#warning ARMCC_3
+#endif
+
+#ifdef ARMCC_3_1
+#warning ARMCC_3_1
+#endif
+
+#ifdef ARMCC_4
+#warning ARMCC_4
+#endif
+
+#ifdef ARMCC_4_0
+#warning ARMCC_4_0
+#endif
+
+#ifdef GCCE
+#warning GCCE
+#endif
+
+#ifdef GCCE_4
+#warning GCCE_4
+#endif
+
+#ifdef GCCE_4_3
+#warning GCCE_4_3
+#endif
+
+#ifdef GCCE_4_4
+#warning GCCE_4_4
+#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/HelloWorldTraces.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-// Created by TraceCompiler 1.3.0
-// DO NOT EDIT, CHANGES WILL BE LOST
-
-#ifndef __HELLOWORLDTRACES_H__
-#define __HELLOWORLDTRACES_H__
-
-#define KOstTraceComponentID 0xe78a5aa3
-
-#define _DOSTARTL 0x30001
-
-
-#endif
-
-// End of file
-
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/fixed_id.definitions Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
-[GROUP]TRACE_NORMAL=0x3
-[TRACE]TRACE_NORMAL[0x3]__DOSTARTL=0x1
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h Mon Nov 30 17:49:36 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifndef __OSTTRACEDEFINITIONS_H__
-#define __OSTTRACEDEFINITIONS_H__
-// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
-// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
-// #define OST_TRACE_COMPILER_IN_USE
-#include <OpenSystemTrace.h>
-#endif
--- a/sbsv2/raptor/util/talon/Makefile Mon Nov 30 17:49:36 2009 +0000
+++ b/sbsv2/raptor/util/talon/Makefile Mon Nov 30 18:04:21 2009 +0000
@@ -23,8 +23,12 @@
ifeq ($(filter win,$(HOSTPLATFORM)),win)
PROCESS_C:=process_win.c
CFLAGS:=-DHOST_WIN
+ifeq ($(SBS_MINGW),)
LDFLAGS:=$(subst \,/,$(SBS_HOME:\=/)\win32\mingw\lib\libiberty.a)
else
+LDFLAGS:=$(subst \,/,$(SBS_MINGW:\=/)\lib\libiberty.a)
+endif
+else
PROCESS_C:=process.c
CFLAGS:=-g
linux_PTHREADLIBS:=-lpthread
Binary file sbsv2/raptor/win32/bin/ransleep.exe has changed
Binary file sbsv2/raptor/win32/bin/talon.exe has changed
Binary file sbsv2/raptor/win32/bin/talonctl.exe has changed