# HG changeset patch
# User Iain Williamson <iain.williamson@nokia.com>
# Date 1266944267 0
# Node ID 019dafe54c232457e0417c220325202581467025
# Parent  a0d304bf0d55a663d5e1b69d815982891959f372# Parent  8426d4dedf84939a791558af954dba1862d73ce5
Merge - GCCXML logfile fix

diff -r 8426d4dedf84 -r 019dafe54c23 sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Tue Feb 23 14:22:19 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Tue Feb 23 16:57:47 2010 +0000
@@ -1,6 +1,5 @@
 Release Notes for Symbian Build System v2
 
-
 next version
 
 Defect Fixes:
@@ -10,7 +9,7 @@
   --no-depend-generate added to suppress the generation and processing of dependency files
   .DEFAULT target introduced for all non --no-depend-generate and/or --no-depend-include builds
 - Add support for PLUGIN3 TARGETTYPEs
-
+- Fixing logfile corruption for large GCCXML builds by suppressing zip output
 
 version 2.12.2
 
diff -r 8426d4dedf84 -r 019dafe54c23 sbsv2/raptor/lib/flm/gccxml.flm
--- a/sbsv2/raptor/lib/flm/gccxml.flm	Tue Feb 23 14:22:19 2010 +0000
+++ b/sbsv2/raptor/lib/flm/gccxml.flm	Tue Feb 23 16:57:47 2010 +0000
@@ -71,7 +71,7 @@
 # $(2) list of further variable arguments to group in 150 element calls
 define groupcallin50
 	$(if $2,$1 $(foreach L,$(wordlist 1,50,$2),$(L)),)
-	$(if $2,$(call groupcallin50,$1,$(wordlist 51,$(words $2),$2)),true)
+	$(if $2,$(call groupcallin50,$1,$(wordlist 51,$(words $2),$2)),@true)
 endef
 
 # echos content to a file in groups performing optional search/replace based on passed args
@@ -235,7 +235,7 @@
 # note: the main call here needs to reside outside of start/endrule in order to avoid command line length issues.
 define gccxmlpackage
   $(TEMPGXPARCHIVE): $(MMPXMLFILE) $(SRCXMLFILES) $(DEFFILE)
-	  $$(call groupcallin50,$(ZIP) -j $$@,$$^ $(RFIFILES)) ;
+	  $$(call groupcallin50,@$(ZIP) -j $$@ > /dev/null 2>&1,$$^ $(RFIFILES)) ;
 	  $(call startrule,gccxmlpackage) \
 	  $(GNURM) -f $(GXPARCHIVE) && \
 	  $(GNUCP) $$@ $(GXPARCHIVE) \