# HG changeset patch # User timothy.murphy@nokia.com # Date 1259604261 0 # Node ID 2b76b04e296d449f86ec8b580e4db4ad84e8b49b # Parent ecf6c5729e53606d5a49bb04457eb2bad8e4f392# Parent d1f6767eec1a5463b9c8954fb158d9033128119c Merge diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/config/gcce.xml --- a/sbsv2/raptor/lib/config/gcce.xml Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/config/gcce.xml Mon Nov 30 18:04:21 2009 +0000 @@ -10,7 +10,7 @@ - + @@ -33,16 +33,17 @@ - + - + - + + @@ -72,24 +73,24 @@ - - + + - - + + - - - + + + - + - + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/config/rvct.xml --- a/sbsv2/raptor/lib/config/rvct.xml Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/config/rvct.xml Mon Nov 30 18:04:21 2009 +0000 @@ -42,7 +42,8 @@ - + + @@ -75,7 +76,7 @@ - + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/config/variants.xml --- a/sbsv2/raptor/lib/config/variants.xml Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/config/variants.xml Mon Nov 30 18:04:21 2009 +0000 @@ -1,256 +1,270 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2.flm --- a/sbsv2/raptor/lib/flm/e32abiv2.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Mon Nov 30 18:04:21 2009 +0000 @@ -595,14 +595,13 @@ $(LD) $(LINKER_MISC_FLAGS) $(LINKER_DEFAULT_LIB_PATHS) $(SYMBIAN_LINK_FLAGS) $(if $(DEBUG_INFO),$(LINKER_DEBUG_OPTION),$(LINKER_NODEBUG_OPTION)) \ $(if $(ARMLIBS),$(LD_WARNINGS_SUPPRESSION_ARMLIBS),) \ $(SHARED_OBJECT_OPTION) $(SPLIT_OPTION) \ - $(RW_BASE_OPTION) 0x400000 \ + $(RW_BASE) \ $(LINKER_ARCH_OPTION) \ - $(SYMVER_OPTION) $(SO_NAME_OPTION) $(call dblquote,$(LINKASVERSIONED)) \ + $(SYMVER_OPTION) $(SO_NAME_OPTION)=$(call dblquote,$(LINKASVERSIONED)) \ $(LINKER_ENTRYPOINT_SETTING) \ -o $$(call dblquote,$$@) \ $(if $(LTCG),$(LTCG_OPTION),) \ - $(LINKER_SYMBOLS_OPTION) $(LINKER_SYMBOLS_FILE_OPTION) \ - $(call dblquote,$(MAPFILE)) \ + $(LINKER_SYMBOLS_OPTION) $(LINKER_SYMBOLS_FILE_OPTION)=$(call dblquote,$(MAPFILE)) \ $(LINKEROPTION) \ $(if $(MULTIFILE_ENABLED),$(call dblquote,$(MULTIFILEOBJECT) $(CIAFILES_LINKOBJECTS)),$(COMMANDFILE_OPTION)$(call dblquote,$(VIAFILE))) \ $(if $(GENERATELINKERFEEDBACK),$(FEEDBACK_OPTION)$(call dblquote,$(FEEDBACKFILE))) \ diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2ani.flm --- a/sbsv2/raptor/lib/flm/e32abiv2ani.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2ani.flm Mon Nov 30 18:04:21 2009 +0000 @@ -29,7 +29,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2defaults.mk --- a/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Mon Nov 30 18:04:21 2009 +0000 @@ -40,13 +40,17 @@ # Reset these variables as they change for every single target type # LINKER_ENTRYPOINT_ADORNMENT will be blank for GCCE; for RVCT it will look like "(uc_exe_.o)" # LINKER_ENTRYPOINT_DECORATION will be blank for RVCT; for GCCE it will look like "-u _E32Startup" +# LINKER_SEPARATOR is a comma for GCCE as g++ is used for linking; for RVCT is should be a space, but +# as make strips trailing spaces, we use the CHAR_SPACE variable. LINKER_ENTRYPOINT_ADORNMENT:= LINKER_ENTRYPOINT_DECORATION:= +LINKER_SEPARATOR:= # For GCCE ifeq ($(TOOLCHAIN),GCCE) -LINKER_ENTRYPOINT_DECORATION:=$(if $(call isoneof,$(TARGETTYPE),exexp exe),-u _E32Startup,-u _E32Dll) +LINKER_ENTRYPOINT_DECORATION:=$(if $(call isoneof,$(TARGETTYPE),exexp exe),-Wl$(CHAR_COMMA)-u$(CHAR_COMMA)_E32Startup,-Wl$(CHAR_COMMA)-u$(CHAR_COMMA)_E32Dll) +LINKER_SEPARATOR:=$(CHAR_COMMA) endif # For RVCT @@ -74,6 +78,7 @@ ifeq ($(TARGETTYPE),kdll) LINKER_ENTRYPOINT_ADORNMENT:=(L_ENTRY_.o) endif +LINKER_SEPARATOR:=$(CHAR_SPACE) endif # "OPTION" metadata from the front-end can potentially be supplied simultaneously for both GCCE and RVCT, diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2dll.flm --- a/sbsv2/raptor/lib/flm/e32abiv2dll.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2dll.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ # Default Linker settings for this target type LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2exe.flm --- a/sbsv2/raptor/lib/flm/e32abiv2exe.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2exe.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ LINKER_STUB_LIBRARY:= LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/$(if $(FIRSTLIB),$(FIRSTLIB),eexe.lib) -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/$(if $(FIRSTLIB),$(FIRSTLIB),eexe.lib)$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/$(if $(FIRSTLIB),$(FIRSTLIB),eexe.lib)$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2exexp.flm --- a/sbsv2/raptor/lib/flm/e32abiv2exexp.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2exexp.flm Mon Nov 30 18:04:21 2009 +0000 @@ -52,10 +52,10 @@ LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/$(FIRSTLIB) ifeq ("$(TOOLCHAIN)","RVCT") -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup $(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)($(FIRSTLIB_OBJECTFILE))) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup $(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)($(FIRSTLIB_OBJECTFILE))) else # GCCE -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup -u _E32Startup $(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup -Wl,-u$(LINKER_SEPARATOR)_E32Startup$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)) endif ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2fsy.flm --- a/sbsv2/raptor/lib/flm/e32abiv2fsy.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2fsy.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ # Determine what kind of entrypoint option to set AUTOEXPORTS:=CreateFileSystem,1; LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2kdll.flm --- a/sbsv2/raptor/lib/flm/e32abiv2kdll.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2kdll.flm Mon Nov 30 18:04:21 2009 +0000 @@ -27,7 +27,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/ekll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/ekll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/ekll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2kext.flm --- a/sbsv2/raptor/lib/flm/e32abiv2kext.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2kext.flm Mon Nov 30 18:04:21 2009 +0000 @@ -34,7 +34,7 @@ # Default Linker settings for this target type LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/eext.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/eext.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/eext.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2ldd.flm --- a/sbsv2/raptor/lib/flm/e32abiv2ldd.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2ldd.flm Mon Nov 30 18:04:21 2009 +0000 @@ -29,7 +29,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edev.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2pdd.flm --- a/sbsv2/raptor/lib/flm/e32abiv2pdd.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2pdd.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edev.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2pdl.flm --- a/sbsv2/raptor/lib/flm/e32abiv2pdl.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2pdl.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2plugin.flm --- a/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Mon Nov 30 18:04:21 2009 +0000 @@ -31,7 +31,7 @@ # Default Linker settings for this target type LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2stddll.flm --- a/sbsv2/raptor/lib/flm/e32abiv2stddll.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2stddll.flm Mon Nov 30 18:04:21 2009 +0000 @@ -29,7 +29,7 @@ # Default Linker settings for this target type LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) DEFAULT_NEWLIB:=$(DEFAULT_STDCPP_NEWLIB) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2stdexe.flm --- a/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ # Determine what kind of entrypoint option to set LINKER_STUB_LIBRARY:= LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/eexe.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/eexe.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/eexe.lib$(LINKER_ENTRYPOINT_ADORNMENT)) DEFAULT_NEWLIB:=$(DEFAULT_STDCPP_NEWLIB) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm --- a/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Mon Nov 30 18:04:21 2009 +0000 @@ -28,7 +28,7 @@ AUTOEXPORTS:=_Z13NotifierArrayv,1; # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION))$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2var.flm --- a/sbsv2/raptor/lib/flm/e32abiv2var.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2var.flm Mon Nov 30 18:04:21 2009 +0000 @@ -29,7 +29,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/evar.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/e32abiv2var2.flm --- a/sbsv2/raptor/lib/flm/e32abiv2var2.flm Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2var2.flm Mon Nov 30 18:04:21 2009 +0000 @@ -29,7 +29,7 @@ # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/evar.lib -LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT)) +LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT)) ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True") LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/lib/flm/standard.xml --- a/sbsv2/raptor/lib/flm/standard.xml Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/lib/flm/standard.xml Mon Nov 30 18:04:21 2009 +0000 @@ -73,7 +73,6 @@ - @@ -163,6 +162,7 @@ + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/python/raptor.py --- a/sbsv2/raptor/python/raptor.py Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/python/raptor.py Mon Nov 30 18:04:21 2009 +0000 @@ -575,10 +575,16 @@ def SetExportOnly(self, TrueOrFalse): self.doExportOnly = TrueOrFalse + if not self.doExport: + self.Error("The --noexport and --export-only options are incompatible - won't to do anything useful") + return False return True def SetNoExport(self, TrueOrFalse): self.doExport = not TrueOrFalse + if self.doExportOnly: + self.Error("The --noexport and --export-only options are incompatible - won't to do anything useful") + return False return True def SetNoBuild(self, TrueOrFalse): diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/common/raptor_tests.py --- a/sbsv2/raptor/test/common/raptor_tests.py Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/common/raptor_tests.py Mon Nov 30 18:04:21 2009 +0000 @@ -100,8 +100,14 @@ except OSError, error: pass else: - (comIn, comOut) = os.popen4("which " + input_file) - output = comOut.read() + whichproc = subprocess.Popen(args=["which", input_file], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + shell=False, + universal_newlines=True) + output = whichproc.stdout.readlines() + whichproc.wait() + if len(output) > 0: locations.append(output[0:(len(output) - 1)]) diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/config/apply_test_variants.xml --- a/sbsv2/raptor/test/config/apply_test_variants.xml Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/config/apply_test_variants.xml Mon Nov 30 18:04:21 2009 +0000 @@ -1,13 +1,13 @@ - - - - - - - - - - - + + + + + + + + + + + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/dll_armv6.py --- a/sbsv2/raptor/test/smoke_suite/dll_armv6.py Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/dll_armv6.py Mon Nov 30 18:04:21 2009 +0000 @@ -1,68 +1,68 @@ -# -# 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: -# - -from raptor_tests import AntiTargetSmokeTest - -def run(): - t = AntiTargetSmokeTest() - - rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf" - targets = [ - "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll.sym", - "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll.sym", - "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso", - "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso", - "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll", - "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll" - ] - antitargets = [ - "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.lib", - "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.lib" - ] - buildtargets = [ - "createstaticdll_dll/armv6/udeb/CreateStaticDLL.o", - "createstaticdll_dll/armv6/urel/CreateStaticDLL.o", - "createstaticdll_dll/armv6/udeb/armv6_specific.o", - "createstaticdll_dll/armv6/urel/armv6_specific.o" - ] - - t.id = "0097a" - t.name = "dll_armv6_rvct" - t.command = rootcommand + " -c armv6" - t.targets = targets - t.antitargets = antitargets - t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) - t.run() - - t.id = "0097b" - t.name = "dll_armv6_clean" - t.command = rootcommand + " -c armv6 clean" - t.targets = [] - t.antitargets = [] - t.run() - - t.id = "0097c" - t.name = "dll_armv6_gcce" - t.command = rootcommand + " -c arm.v6.udeb.gcce4_3_2 -c arm.v6.urel.gcce4_3_2" - t.targets = targets - t.antitargets = antitargets - t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) - t.run() - - t.id = "97" - t.name = "dll_armv6" - t.print_result() - return t +# +# 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: +# + +from raptor_tests import AntiTargetSmokeTest + +def run(): + t = AntiTargetSmokeTest() + + rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf" + targets = [ + "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll.sym", + "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll.sym", + "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso", + "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso", + "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll", + "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll" + ] + antitargets = [ + "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.lib", + "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.lib" + ] + buildtargets = [ + "createstaticdll_dll/armv6/udeb/CreateStaticDLL.o", + "createstaticdll_dll/armv6/urel/CreateStaticDLL.o", + "createstaticdll_dll/armv6/udeb/armv6_specific.o", + "createstaticdll_dll/armv6/urel/armv6_specific.o" + ] + + t.id = "0097a" + t.name = "dll_armv6_rvct" + t.command = rootcommand + " -c armv6" + t.targets = targets + t.antitargets = antitargets + t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) + t.run() + + t.id = "0097b" + t.name = "dll_armv6_clean" + t.command = rootcommand + " -c armv6 clean" + t.targets = [] + t.antitargets = [] + t.run() + + t.id = "0097c" + t.name = "dll_armv6_gcce" + t.command = rootcommand + " -c arm.v6.udeb.gcce4_3_2 -c arm.v6.urel.gcce4_3_2" + t.targets = targets + t.antitargets = antitargets + t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) + t.run() + + t.id = "97" + t.name = "dll_armv6" + t.print_result() + return t diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/dll_armv7.py --- a/sbsv2/raptor/test/smoke_suite/dll_armv7.py Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/dll_armv7.py Mon Nov 30 18:04:21 2009 +0000 @@ -1,61 +1,61 @@ -# -# 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: -# - -from raptor_tests import SmokeTest - -def run(): - t = SmokeTest() - - rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf" - targets = [ - "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll.sym", - "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll.sym", - "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso", - "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso", - "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll", - "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll" - ] - buildtargets = [ - "createstaticdll_dll/armv7/udeb/CreateStaticDLL.o", - "createstaticdll_dll/armv7/urel/CreateStaticDLL.o", - "createstaticdll_dll/armv7/udeb/armv7_specific.o", - "createstaticdll_dll/armv7/urel/armv7_specific.o" - ] - - t.id = "0011a" - t.name = "dll_armv7_rvct" - t.command = rootcommand + " -c armv7" - t.targets = targets - t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) - t.run() - - t.id = "0011b" - t.name = "dll_armv7_clean" - t.command = rootcommand + " -c armv7 clean" - t.targets = [] - t.run() - - t.id = "0011c" - t.name = "dll_armv7_gcce" - t.command = rootcommand + " -c arm.v7.udeb.gcce4_3_2 -c arm.v7.urel.gcce4_3_2" - t.targets = targets - t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) - t.run() - - t.id = "11" - t.name = "dll_armv7" - t.print_result() - return t +# +# 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: +# + +from raptor_tests import SmokeTest + +def run(): + t = SmokeTest() + + rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf" + targets = [ + "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll.sym", + "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll.sym", + "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso", + "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso", + "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll", + "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll" + ] + buildtargets = [ + "createstaticdll_dll/armv7/udeb/CreateStaticDLL.o", + "createstaticdll_dll/armv7/urel/CreateStaticDLL.o", + "createstaticdll_dll/armv7/udeb/armv7_specific.o", + "createstaticdll_dll/armv7/urel/armv7_specific.o" + ] + + t.id = "0011a" + t.name = "dll_armv7_rvct" + t.command = rootcommand + " -c armv7" + t.targets = targets + t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) + t.run() + + t.id = "0011b" + t.name = "dll_armv7_clean" + t.command = rootcommand + " -c armv7 clean" + t.targets = [] + t.run() + + t.id = "0011c" + t.name = "dll_armv7_gcce" + t.command = rootcommand + " -c arm.v7.udeb.gcce4_3_2 -c arm.v7.urel.gcce4_3_2" + t.targets = targets + t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets) + t.run() + + t.id = "11" + t.name = "dll_armv7" + t.print_result() + return t diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/parallel_parsing.py --- a/sbsv2/raptor/test/smoke_suite/parallel_parsing.py Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/parallel_parsing.py Mon Nov 30 18:04:21 2009 +0000 @@ -53,7 +53,7 @@ warnings = 0 - t.id = "103" + t.id = "104" t.name = "parallelparsing" t.description = description t.command = command diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml Mon Nov 30 18:04:21 2009 +0000 @@ -1,14 +1,14 @@ - - - - - - - - - - - + + + + + + + + + + + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf Mon Nov 30 18:04:21 2009 +0000 @@ -1,7 +1,7 @@ - -PRJ_EXPORTS -apply_test_exported_variants.xml /epoc32/tools/makefile_templates/ - -PRJ_MMPFILES -test_mmp_apply.mmp - + +PRJ_EXPORTS +apply_test_exported_variants.xml /epoc32/tools/makefile_templates/ + +PRJ_MMPFILES +test_mmp_apply.mmp + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp Mon Nov 30 18:04:21 2009 +0000 @@ -1,9 +1,9 @@ - -#include "e32def.h" - -char test[] = "test mmp keyword APPLY"; - -TInt E32Main() -{ - return 0; -} + +#include "e32def.h" + +char test[] = "test mmp keyword APPLY"; + +TInt E32Main() +{ + return 0; +} diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,16 +1,16 @@ - -TARGET test_mmp_apply -TARGETTYPE EXE - -APPLY no_such_var - -LIBRARY euser.lib - -SYSTEMINCLUDE /epoc32/include - -APPLY apply_test_append_cdefs - -SOURCE test_mmp_apply.cpp - -APPLY apply_test_exported_var - + +TARGET test_mmp_apply +TARGETTYPE EXE + +APPLY no_such_var + +LIBRARY euser.lib + +SYSTEMINCLUDE /epoc32/include + +APPLY apply_test_append_cdefs + +SOURCE test_mmp_apply.cpp + +APPLY apply_test_exported_var + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf Mon Nov 30 18:04:21 2009 +0000 @@ -1,27 +1,27 @@ -/* -* 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 - -PRJ_MMPFILES -compresstarget.mmp -nocompresstarget.mmp -bytepaircompresstarget.mmp -inflatecompresstarget.mmp -combinedcompresstarget.mmp +/* +* 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 + +PRJ_MMPFILES +compresstarget.mmp +nocompresstarget.mmp +bytepaircompresstarget.mmp +inflatecompresstarget.mmp +combinedcompresstarget.mmp diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,27 +1,27 @@ -/* -* 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 bytepaircompress.exe -TARGETTYPE exe -SOURCEPATH . -SOURCE compress.cpp -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -BYTEPAIRCOMPRESSTARGET +/* +* 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 bytepaircompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +BYTEPAIRCOMPRESSTARGET diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,30 +1,30 @@ -/* -* 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 combinedcompress.exe -TARGETTYPE exe -SOURCEPATH . -SOURCE compress.cpp -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -NOCOMPRESSTARGET -COMPRESSTARGET -INFLATECOMPRESSTARGET -BYTEPAIRCOMPRESSTARGET +/* +* 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 combinedcompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +NOCOMPRESSTARGET +COMPRESSTARGET +INFLATECOMPRESSTARGET +BYTEPAIRCOMPRESSTARGET diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp Mon Nov 30 18:04:21 2009 +0000 @@ -1,22 +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: -* -*/ - -#include "e32def.h" -TInt E32Main() - { - return 0; - } +/* +* 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() + { + return 0; + } diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,27 +1,27 @@ -/* -* 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 compress.exe -TARGETTYPE exe -SOURCEPATH . -SOURCE compress.cpp -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -COMPRESSTARGET +/* +* 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 compress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +COMPRESSTARGET diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,27 +1,27 @@ -/* -* 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 inflatecompress.exe -TARGETTYPE exe -SOURCEPATH . -SOURCE compress.cpp -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -INFLATECOMPRESSTARGET +/* +* 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 inflatecompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +INFLATECOMPRESSTARGET diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,27 +1,27 @@ -/* -* 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 nocompress.exe -TARGETTYPE exe -SOURCEPATH . -SOURCE compress.cpp -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -NOCOMPRESSTARGET +/* +* 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 nocompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +NOCOMPRESSTARGET diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp Mon Nov 30 18:04:21 2009 +0000 @@ -1,27 +1,27 @@ -/* -* 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" // intentional include - -char test[]="Simple test"; - - -TInt test1; - -TInt E32Main() -{ - return 0; -} +/* +* 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" // intentional include + +char test[]="Simple test"; + + +TInt test1; + +TInt E32Main() +{ + return 0; +} diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,30 +1,30 @@ -/* -* Copyright (c) 2005-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 test_softvfp -TARGETTYPE exe -SOURCEPATH . -SOURCE armfpu.cpp - -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -ARMFPU softvfp - -capability all -paged +/* +* Copyright (c) 2005-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 test_softvfp +TARGETTYPE exe +SOURCEPATH . +SOURCE armfpu.cpp + +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +ARMFPU softvfp + +capability all +paged diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp Mon Nov 30 18:04:21 2009 +0000 @@ -1,30 +1,30 @@ -/* -* Copyright (c) 2005-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 test_vfpv2 -TARGETTYPE exe -SOURCEPATH . -SOURCE armfpu.cpp - -UID 0x100039ce 0x00000001 -LIBRARY euser.lib -SECUREID 0x10003a5c -SYSTEMINCLUDE /epoc32/include - -ARMFPU vfpv2 - -capability all -paged +/* +* Copyright (c) 2005-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 test_vfpv2 +TARGETTYPE exe +SOURCEPATH . +SOURCE armfpu.cpp + +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +ARMFPU vfpv2 + +capability all +paged diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf --- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf Mon Nov 30 18:04:21 2009 +0000 @@ -1,26 +1,26 @@ -/* -* 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 - -PRJ_MMPFILES -armfpu_soft.mmp -armfpu_vfpv2.mmp - - +/* +* 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 + +PRJ_MMPFILES +armfpu_soft.mmp +armfpu_vfpv2.mmp + + diff -r d1f6767eec1a -r 2b76b04e296d sbsv2/raptor/test/smoke_suite/toolchain_macros.py --- a/sbsv2/raptor/test/smoke_suite/toolchain_macros.py Sat Nov 28 00:09:57 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/toolchain_macros.py Mon Nov 30 18:04:21 2009 +0000 @@ -1,61 +1,60 @@ -# -# 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: -# - -from raptor_tests import SmokeTest -import string - -def run(): - t = SmokeTest() - t.description = "Check that ARM toolchain specific macros are used in both metadata and source processing." - t.warnings = -1 - - toolchains = { - 'rvct2_2': ['ARMCC', 'ARMCC_2', 'ARMCC_2_2', '__ARMCC__', '__ARMCC_2__', '__ARMCC_2_2__'], - 'rvct3_1': ['ARMCC', 'ARMCC_3', 'ARMCC_3_1', '__ARMCC__', '__ARMCC_3__' , '__ARMCC_3_1__'], - 'rvct4_0': ['ARMCC', 'ARMCC_4', 'ARMCC_4_0', '__ARMCC__', '__ARMCC_4__' , '__ARMCC_4_0__'], - 'gcce4_3_2': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'] -# The following are awaiting easily configurable GCCE version support -# 'gcce4_3_3': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'], -# 'gcce4_4_0': ['GCCE', 'GCCE_4', 'GCCE_4_4', '__GCCE__', '__GCCE_4__' , '__GCCE_4_4__'] - } - - rootname = "toolchain_macros_armv5_%s_%s" - rootcommand = "sbs -b smoke_suite/test_resources/toolchain_macros/bld.inf -c arm.v5.urel." - macromatch = ": #warning( directive:)? %s()?$" - - count = 0 - for toolchain in sorted(toolchains.keys()): - t.id = "0103" + string.ascii_lowercase[count] - t.name = rootname % (toolchain, "clean") - t.command = rootcommand + toolchain + " clean" - t.mustmatch_singleline = [] - t.run() - count += 1 - - t.id = "0103" + string.ascii_lowercase[count] - t.name = rootname % (toolchain, "build") - t.command = rootcommand + toolchain - mustmatch = [] - for macro in toolchains[toolchain]: - mustmatch.append(macromatch % macro) - t.mustmatch_singleline = mustmatch - t.run() - count += 1 - - t.id = "103" - t.name = "toolchain_macros" - t.print_result() - return t +# +# 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: +# + +from raptor_tests import SmokeTest +import string + +def run(): + t = SmokeTest() + t.description = "Check that ARM toolchain specific macros are used in both metadata and source processing." + t.warnings = -1 + + toolchains = { + 'rvct2_2': ['ARMCC', 'ARMCC_2', 'ARMCC_2_2', '__ARMCC__', '__ARMCC_2__', '__ARMCC_2_2__'], + 'rvct3_1': ['ARMCC', 'ARMCC_3', 'ARMCC_3_1', '__ARMCC__', '__ARMCC_3__' , '__ARMCC_3_1__'], + 'rvct4_0': ['ARMCC', 'ARMCC_4', 'ARMCC_4_0', '__ARMCC__', '__ARMCC_4__' , '__ARMCC_4_0__'], + 'gcce4_3_2': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'], + 'gcce4_3_3': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'], + 'gcce4_4_1': ['GCCE', 'GCCE_4', 'GCCE_4_4', '__GCCE__', '__GCCE_4__' , '__GCCE_4_4__'] + } + + rootname = "toolchain_macros_armv5_%s_%s" + rootcommand = "sbs -b smoke_suite/test_resources/toolchain_macros/bld.inf -c arm.v5.urel." + macromatch = ": #warning( directive:)? %s()?$" + + count = 0 + for toolchain in sorted(toolchains.keys()): + t.id = "0103" + string.ascii_lowercase[count] + t.name = rootname % (toolchain, "clean") + t.command = rootcommand + toolchain + " clean" + t.mustmatch_singleline = [] + t.run() + count += 1 + + t.id = "0103" + string.ascii_lowercase[count] + t.name = rootname % (toolchain, "build") + t.command = rootcommand + toolchain + mustmatch = [] + for macro in toolchains[toolchain]: + mustmatch.append(macromatch % macro) + t.mustmatch_singleline = mustmatch + t.run() + count += 1 + + t.id = "103" + t.name = "toolchain_macros" + t.print_result() + return t