FCL/sftools/dev/build: comparison sbsv2/raptor/python/raptor

equal deleted inserted replaced

-:839712f5a78c
+:24e4ef208cca
 import zipfile
 from xml.sax.saxutils import escape
 from mmpparser import *
 import time
+import generic_path
 PiggyBackedBuildPlatforms = {'ARMV5':['GCCXML']}
 PlatformDefaultDefFileDir = {'WINSCW':'bwins',
 			eiloc="." # Someone building with a relative raptor path
 		if biloc is None or biloc == "":
 			biloc="." # Someone building with a relative raptor path
 		self.__StandardVariables = {}
-		# Relative step-down to the root - let's try ignoring this for now, as it
+		# The source root directory is SRCROOT if set in the environment
-		# should amount to the same thing in a world where absolute paths are king
+		# Set TO_ROOT to SRCROOT in case SBS_BUILD_DIR is on a different drive
-		self.__StandardVariables['TO_ROOT'] = ""
+		if 'SRCROOT' in os.environ:
+			self.__StandardVariables['TO_ROOT'] = str(generic_path.Path(os.environ['SRCROOT']))
+		else:
+			self.__StandardVariables['TO_ROOT'] = ""
 		# Top-level bld.inf location
 		self.__StandardVariables['TO_BLDINF'] = biloc
 		self.__StandardVariables['EXTENSION_ROOT'] = eiloc
 		# Get the directory and filename from the full path containing the extension makefile
 		eiloc = str(extInfLocation)
 		if eiloc is None or eiloc == "":
 			eiloc="." # Someone building with a relative raptor path
 		self.__StandardVariables = {}
-		# Relative step-down to the root - let's try ignoring this for now, as it
+		# The source root directory is SRCROOT if set in the environment
-		# should amount to the same thing in a world where absolute paths are king
+		# Set TO_ROOT to SRCROOT in case SBS_BUILD_DIR is on a different drive
-		self.__StandardVariables['TO_ROOT'] = ""
+		if 'SRCROOT' in os.environ:
+			self.__StandardVariables['TO_ROOT'] = str(generic_path.Path(os.environ['SRCROOT']))
+		else:
+			self.__StandardVariables['TO_ROOT'] = ""
 		# Top-level bld.inf location
 		self.__StandardVariables['TO_BLDINF'] = biloc
 		# Location of bld.inf file containing the current EXTENSION block
 		self.__StandardVariables['EXTENSION_ROOT'] = eiloc
 		'killanyprocess':0,
 		'devman':0,
 		'phonenetwork':0,
 		'localnetwork':0
 	  	}
+	# Valid ARMFPU options
+	armfpu_options = [
+		'softvfp',
+		'vfpv2',
+		'softvfp+vfpv2'
+		]
 	library_re = re.compile(r"^(?P<name>[^{]+?)(?P<version>{(?P<major>[0-9]+)\.(?P<minor>[0-9]+)})?(\.(lib|dso))?$",re.I)
 	def __init__(self, aRaptor, aMmpfilename, aBldInfFilename):
 				else:
 					self.__Raptor.Warn("VERSION (%s) missing '.minor' in %s, using '.0'" % (toks[1],self.__currentMmpFile))
 				self.__versionhex = "%04x%04x" % (major, minor)
 				self.BuildVariant.AddOperation(raptor_data.Set(varname, "%d.%d" %(major, minor)))
-				self.BuildVariant.AddOperation(raptor_data.Set(varname+"HEX", self.__versionhex))
+				self.BuildVariant.AddOperation(raptor_data.Set("VERSIONHEX", self.__versionhex))
 				self.__debug("Set "+toks[0]+"  OPTION to " + toks[1])
-				self.__debug("Set "+toks[0]+"HEX OPTION to " + "%04x%04x" % (major,minor))
+				self.__debug("Set VERSIONHEX OPTION to " + self.__versionhex)
 			else:
 				self.__Raptor.Warn("Invalid version supplied to VERSION (%s), using default value" % toks[1])
 		elif varname=='EPOCHEAPSIZE':
 					toks1 = re.sub("[,'\[\]]", "", toks1).replace("//","/")
 				self.__debug("Set "+toks[0]+" to " + toks1)
 				self.BuildVariant.AddOperation(raptor_data.Set(varname,toks1))
 		elif varname=='APPLY':
 			self.ApplyVariants.append(toks[1])
+		elif varname=='ARMFPU':
+			if not str(toks[1]).lower() in self.armfpu_options:
+				self.__Raptor.Error("ARMFPU option '"+str(toks[1])+"' not recognised - should be one of "+", ".join(self.armfpu_options))
+			else:
+				self.__debug("Set "+toks[0]+" to " + str(toks[1]))
+				self.BuildVariant.AddOperation(raptor_data.Set(varname,str(toks[1])))
 		else:
 			self.__debug("Set "+toks[0]+" to " + str(toks[1]))
 			self.BuildVariant.AddOperation(raptor_data.Set(varname,"".join(toks[1])))
 			if varname=='LINKAS':
 		# Put the list of sourcefiles in with one Set operation - saves memory
 		# and performance over using multiple Append operations.
 		self.BuildVariant.AddOperation(raptor_data.Set("SOURCE",
 						   " ".join(self.sources)))
+	def validate(self):
+		"""Test that the parsed MMP file is correct.
+		By "correct" we mean that all the required keywords were present
+		with acceptable and mutually consistent values.
+		There should be no attempt to build anything if this method returns False."""
+		# do all the checks so that we can see all the errors at once...
+		valid = True
+		# for "TARGETTYPE none", it is permitted to omit the "TARGET" keyword
+		if not self.__TARGET and not self.getTargetType() == "none":
+			self.__Raptor.Error("required keyword TARGET is missing in " + self.__currentMmpFile, bldinf=self.__bldInfFilename)
+			valid = False
+		# what else could be wrong?
+		return valid
 	def getTargetType(self):
 		"""Target type in lower case - the standard format"""
 		return self.__targettype.lower()
 	def resolveCompressionKeyword(self, aCompressionKeyword):
 			destDir = destination.Dir()
 			if not destDir.isDir():
 				os.makedirs(str(destDir))
-				shutil.copyfile(source_str, dest_str)
+				# preserve permissions
+				shutil.copy(source_str, dest_str)
 				return exportwhatlog
 			sourceMTime = 0
 			destMTime = 0
 			sourceStat = 0
 						raise MetaDataError(message)
 					else:
 						self.__Raptor.Error(message, bldinf=bldInfFile)
 			if destMTime == 0 or destMTime < sourceMTime:
+				# remove old version
+				#	- not having ownership prevents chmod
+				#	- avoid clobbering the original if it is a hard link
 				if os.path.exists(dest_str):
-					os.chmod(dest_str,stat.S_IREAD | stat.S_IWRITE)
+					os.unlink(dest_str)
-				shutil.copyfile(source_str, dest_str)
+				# preserve permissions
+				shutil.copy(source_str, dest_str)
-				# Ensure that the destination file remains executable if the source was also:
-				os.chmod(dest_str,sourceStat[stat.ST_MODE] | stat.S_IREAD | stat.S_IWRITE | stat.S_IWGRP )
 				self.__Raptor.Info("Copied %s to %s", source_str, dest_str)
 			else:
 				self.__Raptor.Info("Up-to-date: %s", dest_str)
 			markerfiledir = generic_path.Path(_sbs_build_dir)
 			if not markerfiledir.isDir():
 				os.makedirs(str(markerfiledir))
 			# Form the marker file name and convert to Python string
-			markerfilename = str(generic_path.Join(markerfiledir, sanitisedSource + sanitisedDestination + ".unzipped"))
+			combinedPath = sanitisedSource + sanitisedDestination
+			sanitisedPath = self.unzippedPathFragment(combinedPath)
+			markerfilename = str(generic_path.Join(markerfiledir, sanitisedPath + ".unzipped"))
 			# Don't unzip if the marker file is already there or more uptodate
 			sourceMTime = 0
 			destMTime = 0
 			try:
 			for option in options:
 				self.__Raptor.Debug("Set %s=%s", option, options[option])
 				value = options[option].replace('$(EPOCROOT)', '$(EPOCROOT)/')
 				value = value.replace('$(', '$$$$(')
 				value = value.replace('$/', '/').replace('$;', ':')
-				value = value.replace('$/', '/').replace('$;', ':')
 				if customInterface:
 					var.AddOperation(raptor_data.Set(option, value))
 				else:
 					var.AddOperation(raptor_data.Append("O._MEMBERS", option))
 				self.__Raptor.Debug(content)
 				self.__Raptor.Debug("The parse result was %s", parseresult)
 			else:
 				backend.finalise(buildPlatform)
+			# if the parsed MMP file is fundamentally broken then report
+			# the errors and stop processing this MMP node
+			if not backend.validate():
+				continue
 			# feature variation only processes FEATUREVARIANT binaries
 			if buildPlatform["ISFEATUREVARIANT"] and not backend.featureVariant:
 				continue
 			# now build the specification tree
 		if osVersion and osVersion in self.__Raptor.cache.variants:
 			self.__Raptor.Info("applying the OS variant to the configuration \"%s\"." % aBuildUnit.name)
 			aBuildUnit.variants.append(self.__Raptor.cache.variants[osVersion])
 		else:
 			self.__Raptor.Info("no OS variant for the configuration \"%s\"." % aBuildUnit.name)
+	@classmethod
+	def unzippedPathFragment(self, sanitisedPath):
+		fragment = hashlib.md5(sanitisedPath).hexdigest()[:16]
+		return fragment

changeset 616	24e4ef208cca
parent 590	360bd6b35136
child 625	a1925fb7753a