FCL/interim/sftools/linux_build: comparison sbsv2/raptor/python/raptor

equal deleted inserted replaced

-:5e7562f67577
+:c327db0664bb
 #
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 miniCommandOption = "--co"  # update this if another "co" option is added
 # raptor_cli module attributes
 parser = OptionParser(prog = raptor.name,
-					  usage = """%prog [--help] [options] [variable=value] [target] ...
+					  usage = """%prog [--help] [options] [target] ...
 Targets:
 BITMAP         Create bitmap files
 CLEAN          Remove built files and intermediates, but not exported files
 FINAL          Allow extension makefiles to execute final commands
 FREEZE         Freeze exported functions in a .DEF file
 LIBRARY        Create import libraries from frozen .DEF files
 LISTING        Create assembler listing files for source files
 REALLYCLEAN    Same as CLEAN but also remove exported files
-RESOURCE       Create resource files and AIFs
+RESOURCE       Create resource files
 ROMFILE        Create an IBY file to be included in a ROM
 TARGET         Create main executables
 WHAT           List all releaseable targets
 Examples:
 				help="Name of the make engine which runs the build.")
 parser.add_option("--export-only",action="store_true",dest="doExportOnly",
 				help="Generate exports only and do not create any make files.")
+parser.add_option("--noexport",action="store_true",dest="doExport",
+				help="Don't export any files - useful in some builds when you know exports have already been done.")
 parser.add_option("-f","--logfile",action="store",dest="logfile",
 				help="Name of the log file, or '-' for stdout.")
 parser.add_option("--filters",action="store",dest="filter_list",
 				help="Comma-separated list of names of the filters to use (case sensitive).")
 parser.add_option("-n","--nobuild",action="store_true",dest="nobuild",
 				help="Just create makefiles, do not build anything.")
 parser.add_option("--no-depend-include",action="store_true",dest="noDependInclude",
 				help="Do not include generated dependency files. This is only useful for extremely large non-incremental builds.")
+parser.add_option("--no-depend-generate",action="store_true",dest="noDependGenerate",
+				help="Do not generate dependency files. This is only useful for extremely large non-incremental builds.  Implies --no-depend-include.")
 parser.add_option("-o","--orderlayers",action="store_true",dest="sys_def_order_layers",
 				help="Build layers in the System Definition XML file in the order listed or, if given, in the order of -l options.")
 parser.add_option("-p","--project",action="append",dest="project_name",
 				  "off"    -  Do not check tool versions whatsoever.
 				  "forced" -  Check all tool versions. Don't use cached results.
 			""")
+parser.add_option("--timing",action="store_true",dest="timing",
+			help="Show extra timing information for various processes in the build.")
 parser.add_option("--pp",action="store",dest="parallel_parsing",
 				help="""Controls how metadata (e.g. bld.infs) are parsed in Parallel.
 					Possible values are:
 					"on"  - Parse bld.infs in parallel (should be faster on clusters/multicore machines)
+					"slave" - used internally by Raptor
 					"off" - Parse bld.infs serially
 				     """)
 parser.add_option("-v","--version",action="store_true",dest="version",
 				help="Print the version number and exit.")
 	# parse the full set of arguments
 	(options, leftover_args) = parser.parse_args(expanded_args)
 	# the leftover_args are either variable assignments of the form a=b
 	# or target names.
-	regex = re.compile("^(.+)=(.*)$")
 	for leftover in leftover_args:
-		assignment = regex.findall(leftover)
+		Raptor.AddTarget(leftover)
-		if len(assignment) > 0:
-			Raptor.SetEnv(assignment[0][0],assignment[0][1])
-		else:
-			Raptor.AddTarget(leftover)
 	# Define the dictionary of functions to be used.
 	# Attributes and function names can be added easily.
 	# The calling attribute should be the same
 	# as specified when creating the add_option
 				 'logfile' : Raptor.SetLogFileName,
 				 'makefile' : Raptor.SetTopMakefile,
 				 'quiet' : Raptor.RunQuietly,
 				 'debugoutput' : Raptor.SetDebugOutput,
 				 'doExportOnly' : Raptor.SetExportOnly,
+				 'doExport' : Raptor.SetNoExport,
 				 'keepgoing': Raptor.SetKeepGoing,
 				 'nobuild' : Raptor.SetNoBuild,
 				 'make_engine': Raptor.SetMakeEngine,
 				 'make_option': Raptor.AddMakeOption,
 				 'noDependInclude': Raptor.SetNoDependInclude,
+				 'noDependGenerate': Raptor.SetNoDependGenerate,
 				 'number_of_jobs': Raptor.SetJobs,
 				 'project_name' :  Raptor.AddProject,
 				 'filter_list' : Raptor.FilterList,
 				 'ignore_os_detection': Raptor.IgnoreOsDetection,
 				 'check' :  Raptor.SetCheck,
 				 'what' :  Raptor.SetWhat,
 				 'tries' : Raptor.SetTries,
 				 'toolcheck' : Raptor.SetToolCheck,
+				 'timing' : Raptor.SetTiming,
 				 'source_target' : Raptor.AddSourceTarget,
 				 'command_file' : CommandFile,
-				'parallel_parsing' : Raptor.SetParallelParsing,
+				 'parallel_parsing' : Raptor.SetParallelParsing,
-			 	'version' : Raptor.PrintVersion
+			 	 'version' : Raptor.PrintVersion
 				}
 	# Check if Quiet mode has been specified (otherwise we will make noise)
 	if parser.values.quiet:
 		Raptor.RunQuietly(True)

changeset 13	c327db0664bb
parent 2	39c28ec933dd
child 18	de5b887c98f7