sbsv2/raptor/python/raptor_make.py
author Daniel Jacobs <daniel.jacobs@nokia.com>
Thu, 01 Apr 2010 15:50:33 +0100
branchwip
changeset 450 63f3bc391c14
parent 446 0c3dbdc03f47
child 457 9bebdb95e0de
permissions -rw-r--r--
Fix mismatches in test names vs. file names.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     1
#
196
c0d1d904d868 review comments, dates, test ids
timothy.murphy@nokia.com
parents: 192
diff changeset
     2
# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     3
# All rights reserved.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     4
# This component and the accompanying materials are made available
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     5
# under the terms of the License "Eclipse Public License v1.0"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     6
# which accompanies this distribution, and is available
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     7
# at the URL "http://www.eclipse.org/legal/epl-v10.html".
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     8
#
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
     9
# Initial Contributors:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    10
# Nokia Corporation - initial contribution.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    11
#
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    12
# Contributors:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    13
#
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    14
# Description: 
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    15
# raptor_make module
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    16
# This module contains the classes that write and call Makefile wrappers.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    17
#
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    18
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    19
import hashlib
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    20
import os
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    21
import random
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    22
import raptor
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
    23
import raptor_timing
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    24
import raptor_utilities
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    25
import raptor_version
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
    26
import raptor_data
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    27
import re
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    28
import subprocess
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    29
import time
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    30
from raptor_makefile import *
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
    31
import traceback
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
    32
import sys
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
    33
from xml.sax.saxutils import escape
360
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
    34
from xml.sax.saxutils import unescape
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
    35
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    36
191
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
    37
class BadMakeEngineException(Exception):
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
    38
	pass
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
    39
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    40
def XMLEscapeLog(stream):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    41
	inRecipe = False
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    42
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    43
	for line in stream:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    44
		if line.startswith("<recipe"):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    45
			inRecipe = True
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    46
		elif line.startswith("</recipe"):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    47
			inRecipe = False
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    48
			
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    49
		# unless we are inside a "recipe", any line not starting
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    50
		# with "<" is free text that must be escaped.
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    51
		if inRecipe or line.startswith("<"):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    52
			yield line
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    53
		else:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    54
			yield escape(line)
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    55
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    56
def AnnoFileParseOutput(annofile):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    57
	af = open(annofile, "r")
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    58
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    59
	inOutput = False
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    60
	inParseJob = False
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    61
	for line in af:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    62
		line = line.rstrip("\n\r")
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    63
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    64
		if not inOutput:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    65
			if line.startswith("<output>"):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    66
				inOutput = True	
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    67
				yield unescape(line[8:])+'\n'
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    68
				# This is make output so don't unescape it.
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    69
			elif line.startswith('<output src="prog">'):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    70
				line = line[19:]
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    71
				inOutput = True	
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    72
				yield unescape(line)+'\n'
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    73
		else:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    74
			end_output = line.find("</output>")
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    75
		
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    76
			if end_output != -1:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    77
				line = line[:end_output]
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    78
				inOutput = False
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    79
			
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    80
			yield unescape(line)+'\n'
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    81
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    82
	af.close()
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    83
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    84
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
    85
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    86
# raptor_make module classes
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    87
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    88
class MakeEngine(object):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    89
197
dc0508fdfc44 Retain MakeEngine class API. Why not?
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 196
diff changeset
    90
	def __init__(self, Raptor, engine="make_engine"):
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    91
		self.raptor = Raptor
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    92
		self.valid = True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    93
		self.descrambler = None
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    94
		self.descrambler_started = False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    95
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    96
		# look for an alias first as this gives end-users a chance to modify
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    97
		# the shipped variant rather than completely replacing it.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    98
		if engine in Raptor.cache.aliases:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
    99
			avar = Raptor.cache.FindNamedAlias(engine)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   100
		elif engine in Raptor.cache.variants:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   101
			avar = Raptor.cache.FindNamedVariant(engine)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   102
		else:
191
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
   103
			raise BadMakeEngineException("'%s' does not appear to be a make engine - no settings found for it" % engine)
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
   104
192
76300483f6fd fix: get make engine name validation working with aliases.
timothy.murphy@nokia.com
parents: 191
diff changeset
   105
		if not avar.isDerivedFrom("make_engine", Raptor.cache):
191
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
   106
			raise BadMakeEngineException("'%s' is not a build engine (it's a variant but it does not extend 'make_engine')" % engine)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   107
					
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   108
		# find the variant and extract the values
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   109
		try:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   110
			units = avar.GenerateBuildUnits(Raptor.cache)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   111
			evaluator = Raptor.GetEvaluator( None, units[0] , gathertools=True)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   112
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   113
			# shell
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   114
			self.shellpath = evaluator.Get("DEFAULT_SHELL")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   115
			usetalon_s = evaluator.Get("USE_TALON") 
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   116
			self.usetalon = usetalon_s is not None and usetalon_s != ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   117
			self.talonshell = str(evaluator.Get("TALON_SHELL"))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   118
			self.talontimeout = str(evaluator.Get("TALON_TIMEOUT"))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   119
			self.talonretries = str(evaluator.Get("TALON_RETRIES"))
443
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   120
			
446
0c3dbdc03f47 Application of review comments.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 443
diff changeset
   121
			# work around for RVCT 2.2 failed compiles
443
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   122
			delete_on_failed_compile_s = evaluator.Get("DELETE_ON_FAILED_COMPILE")
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   123
			self.delete_on_failed_compile = ""
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   124
			if delete_on_failed_compile_s is not None and delete_on_failed_compile_s != "":
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   125
				self.delete_on_failed_compile = "1"
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   126
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   127
			# commands
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   128
			self.initCommand = evaluator.Get("initialise")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   129
			self.buildCommand = evaluator.Get("build")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   130
			self.shutdownCommand = evaluator.Get("shutdown")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   131
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   132
			# options
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   133
			self.makefileOption = evaluator.Get("makefile")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   134
			self.keepGoingOption = evaluator.Get("keep_going")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   135
			self.jobsOption = evaluator.Get("jobs")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   136
			self.defaultMakeOptions = evaluator.Get("defaultoptions")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   137
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   138
			# Logging
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   139
			#  copylogfromannofile means, for emake, that we should ignore 
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   140
			# emake's console output and instead extract output from its annotation
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   141
			# file.  This is a workaround for a problem where some emake
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   142
			# console output is lost.  The annotation file has a copy of this
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   143
			# output in the "parse" job and it turns out to be uncorrupted.
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   144
			self.copyLogFromAnnoFile = (evaluator.Get("copylogfromannofile") == "true")
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   145
			self.annoFileName = None
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   146
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   147
			if self.copyLogFromAnnoFile:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   148
				for o in self.raptor.makeOptions:
360
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   149
					if o.startswith("--emake-annofile="):
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   150
						self.annoFileName = o[17:]
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   151
						self.raptor.Info("annofile: " + o)
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   152
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   153
				if not self.annoFileName:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   154
					self.raptor.Info("Cannot copy log from annotation file as no annotation filename was specified via the option --mo=--emake-annofile=<filename>")
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   155
					self.copyLogFromAnnoFile = False
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   156
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   157
			# buffering
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   158
			self.scrambled = (evaluator.Get("scrambled") == "true")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   159
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   160
			# check tool versions
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   161
			Raptor.CheckToolset(evaluator, avar.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   162
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   163
			# default targets (can vary per-invocation)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   164
			self.defaultTargets = Raptor.defaultTargets
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   165
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   166
			# work out how to split up makefiles
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   167
			try:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   168
				selectorNames = [ x.strip() for x in evaluator.Get("selectors").split(',') if x.strip() != "" ]
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   169
				self.selectors = []
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   170
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   171
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   172
				if len(selectorNames) > 0:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   173
					for name in selectorNames:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   174
						pattern = evaluator.Get(name.strip() + ".selector.iface")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   175
						target = evaluator.Get(name.strip() + ".selector.target")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   176
						ignoretargets = evaluator.Get(name.strip() + ".selector.ignoretargets")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   177
						self.selectors.append(MakefileSelector(name,pattern,target,ignoretargets))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   178
			except KeyError:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   179
				Raptor.Error("%s.selector.iface, %s.selector.target not found in make engine configuration", name, name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   180
				self.selectors = []
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   181
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   182
		except KeyError:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   183
			self.valid = False
191
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
   184
			raise BadMakeEngineException("Bad '%s' configuration found." % engine)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   185
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   186
		# there must at least be a build command...
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   187
		if not self.buildCommand:
191
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
   188
			self.valid = False
3bfc260b6d61 fix: better error messages when an incorrect make engine is specified. Requires that all make engine variants should extend "make_engine".
timothy.murphy@nokia.com
parents: 176
diff changeset
   189
			raise BadMakeEngineException("No build command for '%s'"% engine)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   190
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   191
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   192
		if self.usetalon:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   193
			talon_settings="""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   194
TALON_SHELL:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   195
TALON_TIMEOUT:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   196
TALON_RECIPEATTRIBUTES:=\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   197
 name='$$RECIPE'\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   198
 target='$$TARGET'\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   199
 host='$$HOSTNAME'\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   200
 layer='$$COMPONENT_LAYER'\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   201
 component='$$COMPONENT_NAME'\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   202
 bldinf='$$COMPONENT_META' mmp='$$PROJECT_META'\
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   203
 config='$$SBS_CONFIGURATION' platform='$$PLATFORM'\
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   204
 phase='$$MAKEFILE_GROUP' source='$$SOURCE'
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   205
export TALON_RECIPEATTRIBUTES TALON_SHELL TALON_TIMEOUT
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   206
USE_TALON:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   207
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   208
""" % (self.talonshell, self.talontimeout, "1")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   209
		else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   210
			talon_settings="""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   211
USE_TALON:=
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   212
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   213
"""
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   214
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   215
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   216
		timing_start = "$(info " + \
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   217
				raptor_timing.Timing.custom_string(tag = "start",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   218
				object_type = "makefile", task = "parse",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   219
				key = "$(THIS_FILENAME)",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   220
				time="$(shell date +%s.%N)").rstrip("\n") + ")"
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   221
				
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   222
		timing_end = "$(info " + \
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   223
				raptor_timing.Timing.custom_string(tag = "end",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   224
				object_type = "makefile", task = "parse",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   225
				key = "$(THIS_FILENAME)",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   226
				time="$(shell date +%s.%N)").rstrip("\n") + ")"
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   227
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   228
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   229
		self.makefile_prologue = """
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   230
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   231
# generated by %s %s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   232
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   233
HOSTPLATFORM:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   234
HOSTPLATFORM_DIR:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   235
OSTYPE:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   236
FLMHOME:=%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   237
SHELL:=%s
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   238
THIS_FILENAME:=$(firstword $(MAKEFILE_LIST))
443
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   239
DELETE_ON_FAILED_COMPILE:=%s 
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   240
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   241
%s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   242
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   243
include %s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   244
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   245
""" 		% (  raptor.name, raptor_version.fullversion(),
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   246
			 " ".join(raptor.hostplatform),
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   247
			 raptor.hostplatform_dir,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   248
			 self.raptor.filesystem,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   249
			 str(self.raptor.systemFLM),
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   250
			 self.shellpath,
443
2f5cedd04db9 Changes for delete on failed compile.
Daniel Jacobs <daniel.jacobs@nokia.com>
parents: 360
diff changeset
   251
			 self.delete_on_failed_compile,
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   252
			 talon_settings,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   253
			 self.raptor.systemFLM.Append('globals.mk') )
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   254
224
c037b5dccbab Ensure that a .DEFAULT target isn't used when --no-depend-include is in play.
Jon Chatten
parents: 220
diff changeset
   255
		# Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to
219
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   256
		# trap missing dependencies (ignoring user config files that we know are usually absent)
225
d401dbd3a410 Ensure that parallel parsing sbs calls pass on --no-depend-generate and --no-depend-include (as these influence makefile generation).
Jon Chatten
parents: 224
diff changeset
   257
		if not (self.raptor.noDependGenerate or self.raptor.noDependInclude):
219
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   258
			self.makefile_prologue += """
225
d401dbd3a410 Ensure that parallel parsing sbs calls pass on --no-depend-generate and --no-depend-include (as these influence makefile generation).
Jon Chatten
parents: 224
diff changeset
   259
219
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   260
$(FLMHOME)/user/final.mk:
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   261
$(FLMHOME)/user/default.flm:
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   262
$(FLMHOME)/user/globals.mk:
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   263
225
d401dbd3a410 Ensure that parallel parsing sbs calls pass on --no-depend-generate and --no-depend-include (as these influence makefile generation).
Jon Chatten
parents: 224
diff changeset
   264
.DEFAULT::
219
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   265
	@echo "<warning>Missing dependency detected: $@</warning>"
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   266
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   267
"""
c3543adfd26e Add --no-depend-generate to the front-end CLI.
Jon Chatten
parents: 134
diff changeset
   268
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   269
		# Only output timings if requested on CLI
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   270
		if self.raptor.timing:
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   271
			self.makefile_prologue += "\n# Print Start-time of Makefile parsing\n" \
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   272
					+ timing_start + "\n\n"
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   273
	
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   274
	
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   275
			self.makefile_epilogue = "\n\n# Print End-time of Makefile parsing\n" \
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   276
				+ timing_end + "\n"
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   277
		else:
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   278
			self.makefile_epilogue = ""
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   279
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   280
		self.makefile_epilogue += """
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   281
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   282
include %s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   283
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   284
""" 			% (self.raptor.systemFLM.Append('final.mk') )
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   285
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   286
	def Write(self, toplevel, specs, configs):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   287
		"""Generate a set of makefiles, or one big Makefile."""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   288
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   289
		if not self.valid:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   290
			return None
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   291
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   292
		self.raptor.Debug("Writing Makefile '%s'" % (str(toplevel)))
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   293
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   294
		self.toplevel = toplevel
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   295
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   296
		# create the top-level makefiles
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   297
		makefileset = None
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   298
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   299
		try:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   300
			makefileset = MakefileSet(directory = str(toplevel.Dir()),
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   301
										   selectors = self.selectors,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   302
										   filenamebase = str(toplevel.File()),
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   303
										   prologue = self.makefile_prologue,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   304
										   epilogue = self.makefile_epilogue,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   305
										   defaulttargets = self.defaultTargets)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   306
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   307
			# are we pruning duplicates?
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   308
			self.prune = self.raptor.pruneDuplicateMakefiles
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   309
			self.hashes = set()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   310
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   311
			# are we writing one Makefile or lots?
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   312
			self.many = not self.raptor.writeSingleMakefile
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   313
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   314
			# add a makefile for each spec under each config
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   315
			config_makefileset = makefileset
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   316
			for c in configs:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   317
				if self.many:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   318
					config_makefileset = makefileset.createChild(c.name)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   319
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   320
				# make sure the config_wide spec item is put out first so that it
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   321
				# can affect everything.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   322
				ordered_specs=[]
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   323
				config_wide_spec = None
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   324
				for s in specs:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   325
					if s.name == "config_wide":
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   326
						config_wide_spec = s
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   327
					else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   328
						ordered_specs.append(s)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   329
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   330
				if config_wide_spec is not None:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   331
					config_wide_spec.Configure(c, cache = self.raptor.cache)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   332
					self.WriteConfiguredSpec(config_makefileset, config_wide_spec, c, True)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   333
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   334
				for s in ordered_specs:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   335
					s.Configure(c, cache = self.raptor.cache)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   336
					self.WriteConfiguredSpec(config_makefileset, s, c, False)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   337
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   338
			makefileset.close()
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   339
		except Exception,e:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   340
			tb = traceback.format_exc()
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   341
			if not self.raptor.debugOutput:
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   342
				tb=""
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   343
			self.raptor.Error("Failed to write makefile '%s': %s : %s" % (str(toplevel),str(e),tb))
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   344
			makefileset = None
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   345
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   346
		return makefileset
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   347
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   348
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   349
	def WriteConfiguredSpec(self, parentMakefileSet, spec, config, useAllInterfaces):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   350
		# ignore this spec if it is empty
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   351
		hasInterface = spec.HasInterface()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   352
		childSpecs = spec.GetChildSpecs()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   353
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   354
		if not hasInterface and not childSpecs:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   355
			return
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   356
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   357
		parameters = []
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   358
		dupe = True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   359
		iface = None
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   360
		guard = None
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   361
		if hasInterface:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   362
			# find the Interface (it may be a ref)
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   363
			try:
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   364
				iface = spec.GetInterface(self.raptor.cache)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   365
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   366
			except raptor_data.MissingInterfaceError, e:	
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   367
				self.raptor.Error("No interface for '%s'", spec.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   368
				return
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   369
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   370
			if iface.abstract:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   371
				self.raptor.Error("Abstract interface '%s' for '%s'",
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   372
								  iface.name, spec.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   373
				return
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   374
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   375
			# we need to guard the FLM call with a hash based on all the
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   376
			# parameter values so that duplicate calls cannot be made.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   377
			# So we need to find all the values before we can write
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   378
			# anything out.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   379
			md5hash = hashlib.md5()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   380
			md5hash.update(iface.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   381
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   382
			# we need an Evaluator to get parameter values for this
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   383
			# Specification in the context of this Configuration
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   384
			evaluator = self.raptor.GetEvaluator(spec, config)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   385
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   386
			def addparam(k, value, default):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   387
				if value == None:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   388
					if p.default != None:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   389
						value = p.default
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   390
					else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   391
						self.raptor.Error("%s undefined for '%s'",
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   392
										  k, spec.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   393
						value = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   394
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   395
				parameters.append((k, value))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   396
				md5hash.update(value)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   397
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   398
			# parameters required by the interface
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   399
			for p in iface.GetParams(self.raptor.cache):
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   400
				val = evaluator.Resolve(p.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   401
				addparam(p.name,val,p.default)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   402
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   403
			# Use Patterns to fetch a group of parameters
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   404
			for g in iface.GetParamGroups(self.raptor.cache):
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   405
				for k,v in evaluator.ResolveMatching(g.patternre):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   406
					addparam(k,v,g.default)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   407
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   408
			hash = md5hash.hexdigest()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   409
			dupe = hash in self.hashes
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   410
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   411
			self.hashes.add(hash)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   412
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   413
		# we only create a Makefile if we have a new FLM call to contribute,
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   414
		# OR we are not pruning duplicates (guarding instead)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   415
		# OR we have some child specs that need something to include them.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   416
		if dupe and self.prune and not childSpecs:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   417
			return
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   418
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   419
		makefileset = parentMakefileSet
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   420
		# Create a new layer of makefiles?
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   421
		if self.many:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   422
			makefileset = makefileset.createChild(spec.name)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   423
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   424
		if not (self.prune and dupe):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   425
			if self.prune:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   426
				guard = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   427
			else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   428
				guard = "guard_" + hash
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   429
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   430
		# generate the call to the FLM
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   431
		if iface is not None:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   432
			makefileset.addCall(spec.name, config.name, iface.name, useAllInterfaces, iface.GetFLMIncludePath(self.raptor.cache), parameters, guard)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   433
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   434
		# recursive includes
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   435
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   436
		for child in childSpecs:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   437
			self.WriteConfiguredSpec(makefileset, child, config, useAllInterfaces)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   438
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   439
		if self.many:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   440
			makefileset.close() # close child set of makefiles as we'll never see them again.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   441
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   442
	def Make(self, makefileset):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   443
		"run the make command"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   444
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   445
		if not self.valid:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   446
			return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   447
	
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   448
		if self.usetalon:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   449
			# Always use Talon since it does the XML not
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   450
			# just descrambling
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   451
			if not self.StartTalon() and not self.raptor.keepGoing:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   452
				self.Tidy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   453
				return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   454
		else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   455
			# use the descrambler if we are doing a parallel build on
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   456
			# a make engine which does not buffer each agent's output
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   457
			if self.raptor.jobs > 1 and self.scrambled:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   458
				self.StartDescrambler()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   459
				if  not self.descrambler_started and not self.raptor.keepGoing:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   460
					self.Tidy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   461
					return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   462
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   463
		# run any initialisation script
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   464
		if self.initCommand:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   465
			self.raptor.Info("Running %s", self.initCommand)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   466
			if os.system(self.initCommand) != 0:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   467
				self.raptor.Error("Failed in %s", self.initCommand)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   468
				self.Tidy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   469
				return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   470
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   471
		# Save file names to a list, to allow the order to be reversed
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   472
		fileName_list = list(makefileset.makefileNames())
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   473
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   474
		# Iterate through args passed to raptor, searching for CLEAN or REALLYCLEAN
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   475
		clean_flag = False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   476
		for arg in self.raptor.args:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   477
			clean_flag = ("CLEAN" in self.raptor.args) or \
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   478
			            ("REALLYCLEAN" in self.raptor.args)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   479
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   480
		# Files should be deleted in the opposite order to the order
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   481
		# they were built. So reverse file order if cleaning
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   482
		if clean_flag:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   483
			fileName_list.reverse()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   484
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   485
		# Report number of makefiles to be built
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   486
		self.raptor.InfoDiscovery(object_type = "makefile", count = len(fileName_list))
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   487
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   488
		# Process each file in turn
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   489
		for makefile in fileName_list:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   490
			if not os.path.exists(makefile):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   491
				self.raptor.Info("Skipping makefile %s", makefile)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   492
				continue
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   493
			self.raptor.Info("Making %s", makefile)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   494
			# assemble the build command line
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   495
			command = self.buildCommand
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   496
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   497
			if self.makefileOption:
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   498
				command += " " + self.makefileOption + " " + ' "' + str(makefile) + '" '
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   499
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   500
			if self.raptor.keepGoing and self.keepGoingOption:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   501
				command += " " + self.keepGoingOption
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   502
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   503
			if self.raptor.jobs > 1 and self.jobsOption:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   504
				command += " " + self.jobsOption +" "+ str(self.raptor.jobs)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   505
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   506
			# Set default options first so that they can be overridden by
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   507
			# ones set by the --mo option on the raptor commandline:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   508
			command += " " + self.defaultMakeOptions
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   509
			# Can supply options on the commandline to override default settings.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   510
			if len(self.raptor.makeOptions) > 0:
122
816955f04aaa Protect some parameters from bash, e.g. ";" and "\"
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 121
diff changeset
   511
				for o in self.raptor.makeOptions:
134
2648751b64b4 Use '' to protect backslashes in arguments rather than escaping. For parallel parsing.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 130
diff changeset
   512
					if o.find(";") != -1 or  o.find("\\") != -1:
122
816955f04aaa Protect some parameters from bash, e.g. ";" and "\"
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 121
diff changeset
   513
						command += "  " + "'" + o + "'"
816955f04aaa Protect some parameters from bash, e.g. ";" and "\"
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 121
diff changeset
   514
					else:
816955f04aaa Protect some parameters from bash, e.g. ";" and "\"
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 121
diff changeset
   515
						command += "  " + o
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   516
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   517
			# Switch off dependency file including?
220
f7d68ecb923e Add support for NO_DEPEND_GENERATE to makefile calls and respond accordingly in FLMs.
Jon Chatten
parents: 219
diff changeset
   518
			if self.raptor.noDependInclude or self.raptor.noDependGenerate:
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   519
				command += " NO_DEPEND_INCLUDE=1"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   520
			
220
f7d68ecb923e Add support for NO_DEPEND_GENERATE to makefile calls and respond accordingly in FLMs.
Jon Chatten
parents: 219
diff changeset
   521
			# Switch off dependency file generation (and, implicitly, inclusion)?
f7d68ecb923e Add support for NO_DEPEND_GENERATE to makefile calls and respond accordingly in FLMs.
Jon Chatten
parents: 219
diff changeset
   522
			if self.raptor.noDependGenerate:
f7d68ecb923e Add support for NO_DEPEND_GENERATE to makefile calls and respond accordingly in FLMs.
Jon Chatten
parents: 219
diff changeset
   523
				command += " NO_DEPEND_GENERATE=1"
f7d68ecb923e Add support for NO_DEPEND_GENERATE to makefile calls and respond accordingly in FLMs.
Jon Chatten
parents: 219
diff changeset
   524
			
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   525
			if self.usetalon:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   526
				# use the descrambler if we set it up
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   527
				command += ' TALON_DESCRAMBLE=' 
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   528
				if self.scrambled:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   529
					command += '1 '
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   530
				else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   531
					command += '0 '
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   532
			else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   533
				if self.descrambler_started:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   534
					command += ' DESCRAMBLE="' + self.descrambler + '"'
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   535
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   536
			# use the retry mechanism if requested
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   537
			if self.raptor.tries > 1:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   538
				command += ' RECIPETRIES=' + str(self.raptor.tries)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   539
				command += ' TALON_RETRIES=' + str(self.raptor.tries - 1)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   540
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   541
			# targets go at the end, if the makefile supports them
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   542
			addTargets = self.raptor.targets[:]
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   543
			ignoreTargets = makefileset.ignoreTargets(makefile)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   544
			if addTargets and ignoreTargets:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   545
				for target in self.raptor.targets:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   546
					if re.match(ignoreTargets, target):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   547
						addTargets.remove(target)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   548
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   549
			if addTargets:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   550
				command += " " + " ".join(addTargets)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   551
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   552
			# Send stderr to a file so that it can't mess up the log (e.g.
130
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   553
			# clock skew messages from some build engines scatter their
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   554
			# output across our xml.
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   555
			stderrfilename = makefile+'.stderr'
355
24d0baf736db test stdout to a file (debug XML problem)
timothy.murphy@nokia.com
parents: 226
diff changeset
   556
			stdoutfilename = makefile+'.stdout'
122
816955f04aaa Protect some parameters from bash, e.g. ";" and "\"
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 121
diff changeset
   557
			command += " 2>'%s' " % stderrfilename
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   558
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   559
			# Keep a copy of the stdout too in the case of using the 
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   560
			# annofile - so that we can trap the problem that
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   561
			# makes the copy-log-from-annofile workaround necessary
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   562
			# and perhaps determine when we can remove it.
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   563
			if self.copyLogFromAnnoFile:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   564
				command += " >'%s' " % stdoutfilename
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   565
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   566
			# Substitute the makefile name for any occurrence of #MAKEFILE#
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   567
			command = command.replace("#MAKEFILE#", str(makefile))
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   568
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   569
			self.raptor.Info("Executing '%s'", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   570
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   571
			# execute the build.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   572
			# the actual call differs between Windows and Unix.
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   573
			# bufsize=1 means "line buffered"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   574
			#
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   575
			try:
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   576
				# Time the build
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   577
				self.raptor.InfoStartTime(object_type = "makefile",
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   578
						task = "build", key = str(makefile))
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   579
				
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   580
				makeenv=os.environ.copy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   581
				if self.usetalon:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   582
					makeenv['TALON_RECIPEATTRIBUTES']="none"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   583
					makeenv['TALON_SHELL']=self.talonshell
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   584
					makeenv['TALON_BUILDID']=str(self.buildID)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   585
					makeenv['TALON_TIMEOUT']=str(self.talontimeout)
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   586
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   587
				if self.raptor.filesystem == "unix":
118
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   588
					p = subprocess.Popen([command], bufsize=65535,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   589
						stdout=subprocess.PIPE,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   590
						stderr=subprocess.STDOUT,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   591
						close_fds=True, env=makeenv, shell=True)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   592
				else:
118
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   593
					p = subprocess.Popen(args = 
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   594
						[raptor_data.ToolSet.shell, '-c', command],
118
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   595
						bufsize=65535,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   596
						stdout=subprocess.PIPE,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   597
						stderr=subprocess.STDOUT,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   598
						shell = False,
375b7128e900 Put stderr into separate log file
timothy.murphy@nokia.com
parents: 29
diff changeset
   599
						universal_newlines=True, env=makeenv)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   600
				stream = p.stdout
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   601
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   602
				inRecipe = False
121
5e5ae3e212b3 Stderr to a file - avoid xml problems in error messages.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 118
diff changeset
   603
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   604
				if not self.copyLogFromAnnoFile:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   605
					for l in XMLEscapeLog(stream):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   606
						self.raptor.out.write(l)
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   607
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   608
					returncode = p.wait()
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   609
				else:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   610
					returncode = p.wait()
355
24d0baf736db test stdout to a file (debug XML problem)
timothy.murphy@nokia.com
parents: 226
diff changeset
   611
360
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   612
					annofilename = self.annoFileName.replace("#MAKEFILE#", makefile)
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   613
					self.raptor.Info("copylogfromannofile: Copying log from annotation file %s to work around a potential problem with the console output", annofilename)
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   614
					try:
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   615
						for l in XMLEscapeLog(AnnoFileParseOutput(annofilename)):
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   616
							self.raptor.out.write(l)
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   617
					except Exception,e:
360
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   618
						self.raptor.Error("Couldn't complete stdout output from annofile %s for %s - '%s'", annofilename, command, str(e))
355
24d0baf736db test stdout to a file (debug XML problem)
timothy.murphy@nokia.com
parents: 226
diff changeset
   619
24d0baf736db test stdout to a file (debug XML problem)
timothy.murphy@nokia.com
parents: 226
diff changeset
   620
130
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   621
				# Take all the stderr output that went into the .stderr file
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   622
				# and put it back into the log, but safely so it can't mess up
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   623
				# xml parsers.
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   624
				try:
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   625
					e = open(stderrfilename,"r")
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   626
					for line in e:
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   627
						self.raptor.out.write(escape(line))
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   628
					e.close()
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   629
				except Exception,e:
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   630
					self.raptor.Error("Couldn't complete stderr output for %s - '%s'", command, str(e))
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   631
				# Report end-time of the build
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   632
				self.raptor.InfoEndTime(object_type = "makefile",
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   633
						task = "build", key = str(makefile))
130
4f2ae0d78608 fix: add .stderr dumfile to log *after* make engine has exited.
raptorbot <raptorbot@systemstesthead.symbian.intra>
parents: 122
diff changeset
   634
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   635
				if returncode != 0  and not self.raptor.keepGoing:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   636
					self.Tidy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   637
					return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   638
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   639
			except Exception,e:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   640
				self.raptor.Error("Exception '%s' during '%s'", str(e), command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   641
				self.Tidy()
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   642
				# Still report end-time of the build
360
77642c41e033 fix: emake log output corruption fix by using output from the annotation file. Updates.
timothy.murphy@nokia.com
parents: 357
diff changeset
   643
				self.raptor.InfoEndTime(object_type = "Building", task = "Makefile",
29
ee00c00df073 Catchup to Perforce WIP with timing, python24
timothy.murphy@nokia.com
parents: 5
diff changeset
   644
						key = str(makefile))
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   645
				return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   646
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   647
		# run any shutdown script
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   648
		if self.shutdownCommand != None and self.shutdownCommand != "":
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   649
			self.raptor.Info("Running %s", self.shutdownCommand)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   650
			if os.system(self.shutdownCommand) != 0:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   651
				self.raptor.Error("Failed in %s", self.shutdownCommand)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   652
				self.Tidy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   653
				return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   654
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   655
		self.Tidy()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   656
		return True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   657
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   658
	def Tidy(self):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   659
		if self.usetalon:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   660
			self.StopTalon() 
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   661
		else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   662
			"clean up after the make command"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   663
			self.StopDescrambler()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   664
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   665
	def StartTalon(self):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   666
		# the talon command
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   667
		beginning = raptor.hostplatform_dir + "/bin"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   668
		if "win" in raptor.hostplatform:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   669
			end = ".exe"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   670
		else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   671
			end = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   672
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   673
		self.talonctl = str(self.raptor.home.Append(beginning, "talonctl"+end))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   674
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   675
		# generate a unique build number
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   676
		random.seed()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   677
		looking = True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   678
		tries = 0
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   679
		while looking and tries < 100:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   680
			self.buildID = raptor.name + str(random.getrandbits(32))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   681
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   682
			command = self.talonctl + " start"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   683
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   684
			os.environ["TALON_BUILDID"] = self.buildID
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   685
			self.raptor.Info("Running %s", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   686
			looking = (os.system(command) != 0)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   687
			tries += 1
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   688
		if looking:
5
593a8820b912 Team Wip branch
tnmurphy@4GBL06592.nokia.com
parents: 3
diff changeset
   689
			self.raptor.Error("Failed to initialise the talon shell for this build")
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   690
			self.talonctl = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   691
			return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   692
		
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   693
		return True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   694
	
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   695
	def StopTalon(self):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   696
		if self.talonctl:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   697
			command = self.talonctl + " stop"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   698
			self.talonctl = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   699
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   700
			self.raptor.Info("Running %s", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   701
			if os.system(command) != 0:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   702
				self.raptor.Error("Failed in %s", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   703
				return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   704
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   705
		return True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   706
	
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   707
	def StartDescrambler(self):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   708
		# the descrambler command
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   709
		beginning = raptor.hostplatform_dir + "/bin"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   710
		if "win" in raptor.hostplatform:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   711
			end = ".exe"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   712
		else:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   713
			end = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   714
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   715
		self.descrambler = str(self.raptor.home.Append(beginning, "sbs_descramble"+end))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   716
			
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   717
		# generate a unique build number
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   718
		random.seed()
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   719
		looking = True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   720
		tries = 0
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   721
		while looking and tries < 100:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   722
			buildID = raptor.name + str(random.getrandbits(32))
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   723
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   724
			command = self.descrambler + " " + buildID + " start"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   725
			self.raptor.Info("Running %s", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   726
			looking = (os.system(command) != 0)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   727
			tries += 1
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   728
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   729
		if looking:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   730
			self.raptor.Error("Failed to start the log descrambler")
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   731
			self.descrambler_started = True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   732
			return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   733
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   734
		self.descrambler_started = True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   735
		self.descrambler +=	" " + buildID
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   736
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   737
		return  True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   738
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   739
	def StopDescrambler(self):
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   740
		if self.descrambler_started:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   741
			command = self.descrambler + " stop"
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   742
			self.descrambler = ""
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   743
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   744
			self.raptor.Info("Running %s", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   745
			if os.system(command) != 0:
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   746
				self.raptor.Error("Failed in %s", command)
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   747
				return False
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   748
		return True
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   749
357
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   750
b4baa7ca35a7 fix: emake log output corruption fix by using output from the annotation file.
timothy.murphy@nokia.com
parents: 355
diff changeset
   751
3
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   752
# raptor_make module functions
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   753
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   754
e1eecf4d390d Team sf branch.
tnmurphy@4GBL06592.nokia.com
parents: 0
diff changeset
   755
# end of the raptor_make module