# HG changeset patch
# User Jon Chatten
# Date 1269443886 0
# Node ID 629079c72ee4068ac0bdef789b18ad39d9bc3643
# Parent  421e376bfce4076a64e9c07e56d09070720cc73e
Suppress trigraph warnings in resource file preprocessing.

diff -r 421e376bfce4 -r 629079c72ee4 sbsv2/raptor/lib/flm/resource.flm
--- a/sbsv2/raptor/lib/flm/resource.flm	Tue Mar 23 13:34:00 2010 +0000
+++ b/sbsv2/raptor/lib/flm/resource.flm	Wed Mar 24 15:18:06 2010 +0000
@@ -112,7 +112,7 @@
 $(call makepath,$(INTERBASE))
 
 # common pre-processor options
-CPPOPT:=-nostdinc -undef -D_UNICODE -include $(PRODUCT_INCLUDE)\
+CPPOPT:=-nostdinc -undef -Wno-trigraphs -D_UNICODE -include $(PRODUCT_INCLUDE)\
  -I$(dir $(SOURCE)) $(foreach I, $(USERINCLUDE),-I$(I) ) -I- $(foreach J,$(SYSTEMINCLUDE),-I$(J) )
 
 CREATABLEPATHS:=$(RSCDIR) $(RSGDIR) $(OUTPUTPATH)
diff -r 421e376bfce4 -r 629079c72ee4 sbsv2/raptor/test/smoke_suite/resource.py
--- a/sbsv2/raptor/test/smoke_suite/resource.py	Tue Mar 23 13:34:00 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/resource.py	Wed Mar 24 15:18:06 2010 +0000
@@ -63,5 +63,7 @@
 		"helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp",
 		"helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp.d"])
 
+	t.mustnotmatch = ["HelloWorld.rss.* warning: trigraph"]
+	
 	t.run()
 	return t
diff -r 421e376bfce4 -r 629079c72ee4 sbsv2/raptor/test/smoke_suite/test_resources/simple_gui/HelloWorld.rss
--- a/sbsv2/raptor/test/smoke_suite/test_resources/simple_gui/HelloWorld.rss	Tue Mar 23 13:34:00 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_gui/HelloWorld.rss	Wed Mar 24 15:18:06 2010 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-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"
@@ -66,6 +66,7 @@
 RESOURCE TBUF r_example_text_Item0 { buf="Item 0"; }
 RESOURCE TBUF r_example_text_Item1 { buf="Item 1"; }
 RESOURCE TBUF r_example_text_Item2 { buf="Item 2"; }
+RESOURCE TBUF r_example_text_Item3 { buf="This string generates a trigraph warning if not suppressed: <h>ID3?????????<m>"; }
 
 RESOURCE LOCALISABLE_APP_INFO r_lai
 	{