# an entire Project
class Project:
- def __init__(self, folder, projectConfig, globalConfig):
+ def __init__(self, folder, config):
self.folder = folder
- self.name = projectConfig['name']
+ self.name = config['name']
# VCS
- vcsName = projectConfig['vcs']
+ vcsName = config['vcs']
if vcsName == 'git':
- self.vcs = vcs.Git(self.sourceFolder(), projectConfig['url'], projectConfig['version'])
+ self.vcs = vcs.Git(self.sourceFolder(), config['url'], config['version'])
elif vcsName == 'svn':
- self.vcs = vcs.SVN(self.sourceFolder(), projectConfig['url'], projectConfig.get('versionName'))
+ self.vcs = vcs.SVN(self.sourceFolder(), config['url'])
else:
raise Exception("Unknown VCS type "+vcsName)
# build system
- if globalConfig.get('buildDeb', False):
- self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), projectConfig, self.vcs, globalConfig)
+ if config.get('buildDeb', False):
+ self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), config, self.vcs)
else:
- buildSystemName = projectConfig['buildSystem']
+ buildSystemName = config['buildSystem']
if buildSystemName == 'cmake':
- self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), projectConfig, globalConfig)
+ self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), config)
else:
raise Exception("Unknown build system type "+buildSystemName)
parser.add_argument("--reconfigure",
action="store_true", dest="reconfigure",
help="Force configuration to be run")
+parser.add_argument("--wait-after-config",
+ action="store_true", dest="wait_after_config",
+ help="Wait for user confirmation after configuration is finished")
parser.add_argument("--reset-source",
action="store_true", dest="reset_source",
help="Reset sourcecode to the given version (removes local changes!)")
help="Do not update projects before compilation")
parser.add_argument("--resume-from", metavar='PROJECT',
dest="resume_from",
- help="Resume building from the given project")
+ help="From the projects specified, continue building with this one (i.e., remove all projects before this one from the list - this never adds new projects)")
parser.add_argument("projects", metavar='PROJECT', nargs='*',
help="Manually specify projects or folders to be built (project names take precedence)")
args = parser.parse_args()
allFolders = {} # all folders
workProjects = [] # projects we work on
-# return the position of the given item in the list
-def findInList(list, item):
- for i in xrange(len(list)):
- if list[i] == item:
- return i
- raise Exception("%s not found in list" % str(item))
+# copy all items which don't exist below, except for those in the exclude list
+def inherit(subConfig, superConfig, exclude = ('name', 'projects')):
+ for name in superConfig.keys():
+ if (not name in subConfig) and (not name in exclude):
+ subConfig[name] = superConfig[name]
# populate list of projects, return list of projects in that folder
-def loadProjects(projects, folder=''):
+def loadProjects(config, folder=''):
folderProjects = []
- for projectConfig in projects:
- if 'folder' in projectConfig: # a subpath
- folderProjects += loadProjects(projectConfig['projects'], os.path.join(folder, projectConfig['folder']))
+ for projectConfig in config['projects']:
+ assert 'name' in projectConfig # everything must have a name
+ inherit(projectConfig, config)
+ if 'projects' in projectConfig: # a subpath
+ folderProjects += loadProjects(projectConfig, os.path.join(folder, projectConfig['name']))
else: # a proper project
if projectConfig['name'] in allProjects:
- raise Exception("Duplicate project name "+project['name'])
- project = Project(folder, projectConfig, config)
+ raise Exception("Duplicate project name "+projectConfig['name'])
+ project = Project(folder, projectConfig)
allProjects[projectConfig['name']] = project
folderProjects.append(project)
# store projects of this folder
allFolders[folder] = folderProjects
return folderProjects
-# now check what we have to do
-loadProjects(config['projects'])
+# load available projects
+loadProjects(config)
+# get base set og projects to process
if args.projects:
- if args.resume_from is not None:
- raise Exception("Can not use --resume-from and manually specify projects")
for name in args.projects:
if name in allProjects:
workProjects.append(allProjects[name])
elif name in allFolders:
workProjects += allFolders[name]
else:
- raise Exception("Project or folder%s does not exist" % name)
-elif args.resume_from is None:
- workProjects = projects.values() # all the projects
+ raise Exception("Project or folder %s does not exist" % name)
else:
- if not args.resume_from in allProjects:
- raise Exception("Project %s does not exist" % args.resume_from)
- startWith = allProjects[args.resume_from]
- startIndex = findInList(allProjects.values(), startWith)
- workProjects = allProjects.values()[startIndex:]
+ workProjects = allProjects.values() # all the projects
+# apply the "resume from"
+if args.resume_from is not None:
+ # find project index
+ startIndex = 0
+ while startIndex < len(workProjects):
+ if workProjects[startIndex].name == args.resume_from:
+ break # we found it
+ else:
+ startIndex += 1
+ if startIndex >= len(workProjects): # project not found
+ raise Exception("%s not found in list of projects to work on" % args.resume_from)
+ # start here
+ workProjects = workProjects[startIndex:]
# and do it!
for project in workProjects:
print "Updating project",project.sourceFolder()
project.vcs.update(forceVersion=args.reset_source)
print "Building project",project.sourceFolder()
- project.buildSystem.build(reconfigure=args.reconfigure)
+ project.buildSystem.build(reconfigure=args.reconfigure, waitAfterConfig=args.wait_after_config)
print
except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
print >> sys.stderr
projects / mass-build.git / blobdiff