# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1259852388 0
# Node ID fdfc59a2ae7ecef9b3d89685efac13cbc70484f8
# Parent  c7bbe0e983d37974aede0648b65d1a66d0eef19e
fix for broken cpp location

diff -r c7bbe0e983d3 -r fdfc59a2ae7e sbsv2/raptor/python/raptor_meta.py
--- a/sbsv2/raptor/python/raptor_meta.py	Thu Dec 03 14:26:46 2009 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Thu Dec 03 14:59:48 2009 +0000
@@ -297,9 +297,8 @@
 	def call(self, aArgs, sourcefilename):
 		""" Override call so that we can do our own error handling."""
 		tool = self._ExternalTool__Tool
+		commandline = tool + " " + aArgs + " " + str(sourcefilename)
 		try:
-			commandline = tool + " " + aArgs + " " + str(sourcefilename)
-
 			# the actual call differs between Windows and Unix
 			if raptor_utilities.getOSFileSystem() == "unix":
 				p = subprocess.Popen(commandline, \
@@ -345,7 +344,7 @@
 				raise MetaDataError("Errors in %s" % str(sourcefilename))
 
 		except Exception,e:
-			raise MetaDataError("Preprocessor exception: %s" % str(e))
+			raise MetaDataError("Preprocessor exception: '%s' : in command : '%s'" % (str(e), commandline))
 
 		return 0	# all OK
 
diff -r c7bbe0e983d3 -r fdfc59a2ae7e sbsv2/raptor/test/unit_suite/raptor_meta_unit.py
--- a/sbsv2/raptor/test/unit_suite/raptor_meta_unit.py	Thu Dec 03 14:26:46 2009 +0000
+++ b/sbsv2/raptor/test/unit_suite/raptor_meta_unit.py	Thu Dec 03 14:59:48 2009 +0000
@@ -141,12 +141,10 @@
 		
 		# Get the version of CPP that we are using and hope it's correct
 		# since there is no tool check.
-		if raptor_utilities.getOSFileSystem() == "cygwin":
-			self.__gnucpp = os.environ[raptor.env] + "/win32/bv/bin/cpp" 
+		if os.environ.has_key('SBS_GNUCPP'):
+			self.__gnucpp = os.environ['SBS_GNUCPP']
 		else: 
 			self.__gnucpp = "cpp" 
-		if os.environ.has_key('GNUCPP'):
-			self.__gnucpp = os.environ['GNUCPP']
 	
 	def testPreProcessor(self):
 		# Just test for correct behaviour on failure, other tests excercise correct behaviour on success