# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1263484998 0
# Node ID c02a2a09d864c324d0232c5578b2b7ea57fa9669
# Parent  cf0c187b284a6669d4a9e1568607f65f96ca05ea# Parent  5e2f17481596e89fba2e1f9bac9208b4dfe5aa4d
catch up to 2.11.3 from fix

diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Thu Jan 14 16:03:18 2010 +0000
@@ -1,6 +1,15 @@
 
 Release Notes for Symbian Build System v2
 
+version 2.11.3
+
+Defect Fixes:
+DPDEF142616 Raptor: Variables can be set unnecessarily prior to TEM execution
+Fix for: filter terminal flags up when recipe truncated
+SF bug 170: invalid XML output when a zip file is missing
+SF bug 518: unpaged keyword in mmp files is not parsed properly
+
+
 version 2.11.2
 
 Defect Fixes:
diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/lib/flm/e32postlink.mk
--- a/sbsv2/raptor/lib/flm/e32postlink.mk	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32postlink.mk	Thu Jan 14 16:03:18 2010 +0000
@@ -85,7 +85,7 @@
   POSTLINKER_PAGEDOPTION:=--paged
 endif
 ifeq ($(PAGED),0)
-  POSTLINKER_PAGEDOPTION:--unpaged
+  POSTLINKER_PAGEDOPTION:=--unpaged
 endif
 
 # Postlink target
diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/lib/flm/template_ext.flm
--- a/sbsv2/raptor/lib/flm/template_ext.flm	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/lib/flm/template_ext.flm	Thu Jan 14 16:03:18 2010 +0000
@@ -121,7 +121,7 @@
 	RMDIR RM ERASE MKDIR CP                 \
 	PLATFORM_PATH CFG_PATH                  \
 	TEMPLATE_EXTENSION_MAKEFILE             \
-	TARGET SOURCE DEPENDENCIES TOOL PRODUCT_INCLUDE \
+	PRODUCT_INCLUDE \
 	RVCTBIN RVCTINC RVCTLIB
 
 
diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/python/plugins/filter_terminal.py
--- a/sbsv2/raptor/python/plugins/filter_terminal.py	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_terminal.py	Thu Jan 14 16:03:18 2010 +0000
@@ -105,7 +105,7 @@
 
 	attribute_re = re.compile("([a-z][a-z0-9]*)='([^']*)'",re.I)
 	maxdots = 40 # if one prints dots then don't print masses
-	recipelinelimit = 200 # don't scan ultra-long recipes in case we run out of memory
+	recipelinelimit = 1024 # don't scan ultra-long recipes in case we run out of memory
 
 	# recipes that we think most users are interested in
 	# and the mapping that we will use to output them as
@@ -282,6 +282,7 @@
 			# This variable holds all recipe information
 			self.failed = False # Recipe status
 			self.recipeBody = []
+			self.recipelineExceeded = 0
 			return		
 		elif text.startswith("</recipe>"):
 			# detect the end of a recipe
@@ -311,7 +312,7 @@
 					r = Recipe.factory(self.recipe_dict['name'], "".join(self.recipeBody))
 					warnings = r.warnings()
 					info = r.info()
-					if len(warnings) > 0:
+					if len(warnings) or len(info):
 						if not self.analyseonly:
 							for L in self.recipeBody:
 								if not L.startswith('+'):
@@ -336,6 +337,11 @@
 		elif text.startswith("]]>"):
 			if self.inRecipe:
 				self.inBody = False
+				if self.recipelineExceeded > 0:
+					self.recipeBody.append("[filter_terminal: OUTPUT TRUNCATED: " + \
+						"Recipe output limit exceeded; see logfile for full output " + \
+						"(%s lines shown out of %s)]" % (FilterTerminal.recipelinelimit, \
+						FilterTerminal.recipelinelimit + self.recipelineExceeded))
 		elif text.startswith("<info>Copied"):
 			if not self.analyseonly and not self.quiet:
 				start = text.find(" to ") + 4
@@ -365,8 +371,11 @@
 			# we have to keep the output until we find out
 			# if the recipe failed. But not all of it if it turns
 			# out to be very long
-			if len(self.recipeBody) < FilterTerminal.recipelinelimit:
+			if len(self.recipeBody) <= FilterTerminal.recipelinelimit:
 				self.recipeBody.append(text)
+			else:
+				self.recipelineExceeded += 1
+
 
 	def logit(self):
 		""" log a message """
diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/python/raptor_meta.py
--- a/sbsv2/raptor/python/raptor_meta.py	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Thu Jan 14 16:03:18 2010 +0000
@@ -2782,10 +2782,11 @@
 							# export the file
 							exportwhatlog += self.CopyExport(fromFile, toFile, bldinf_filename)
 						else:
-							exportwhatlog += ("<archive zipfile='" + str(fromFile) + "'>\n")
 							members = self.UnzipExport(fromFile, toFile,
 									str(exportPlatform['SBS_BUILD_DIR']),
 									bldinf_filename)
+							
+							exportwhatlog += ("<archive zipfile='" + str(fromFile) + "'>\n")
 							if members != None:
 								exportwhatlog += members
 							exportwhatlog += "</archive>\n"
diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/python/raptor_version.py
--- a/sbsv2/raptor/python/raptor_version.py	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/python/raptor_version.py	Thu Jan 14 16:03:18 2010 +0000
@@ -15,7 +15,7 @@
 # raptor version information module
 #
 
-version=(2,11,2,"2009-12-11","symbian build system")
+version=(2,11,3,"2010-01-12","symbian build system")
 
 def numericversion():
 	"""Raptor version string"""
diff -r cf0c187b284a -r c02a2a09d864 sbsv2/raptor/test/smoke_suite/dll_armv5_winscw_freeze.py
--- a/sbsv2/raptor/test/smoke_suite/dll_armv5_winscw_freeze.py	Mon Dec 14 18:19:38 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/dll_armv5_winscw_freeze.py	Thu Jan 14 16:03:18 2010 +0000
@@ -86,6 +86,22 @@
 			
 	t.run()
 	
+
+	t.id = "0012d"
+	t.name = "efreeze_info"
+	
+	t.command = "sbs -b smoke_suite/test_resources/unfrozen/freeze.inf" \
+			+ " -p unfrozensymbols_for_freeze.mmp -c winscw freeze"
+			
+	t.mustmatch = [
+		"EFREEZE: DEF file up to date"
+	]
+	t.warnings = 0
+	t.errors = 0
+			
+	t.run()
+
+
 	t.id = "12"
 	t.name = "dll_armv5_winscw_freeze"
 	t.print_result()