Make config inherited
[mass-build.git] / mass_build.py
index 1c84070b3d918ed7de24fdc76c00af8d8dbfe651..6bbba4c23d8429e9b48c618ac6c94fbc73246cd1 100755 (executable)
@@ -3,50 +3,26 @@ import vcs, build_system, imp
 import argparse, os, sys, subprocess
 from collections import OrderedDict
 
-# read command-line arguments
-parser = argparse.ArgumentParser(description='Update and build a bunch of stuff')
-parser.add_argument("-c, --config",
-                    dest="config", default="mass-build.conf",
-                    help="mass-build config file")
-parser.add_argument("--reconfigure",
-                    action="store_true", dest="reconfigure",
-                    help="Force configuration to be run")
-parser.add_argument("--no-update",
-                    action="store_false", dest="update",
-                    help="Do not update modules before compilation")
-parser.add_argument("--resume-from", metavar='MODULE',
-                    dest="resume_from",
-                    help="Resume building from the given repository")
-parser.add_argument("modules",  metavar='MODULE', nargs='*',
-                    help="Manually specify modules to be built")
-args = parser.parse_args()
-
-# load config
-config = imp.load_source('config', args.config).__dict__
-os.remove(args.config+'c') # remove compiled python file
-projects = OrderedDict() # all projects
-workProjects = [] # projects we work on
-
 # an entire Project
 class Project:
-       def __init__(self, config, folder, module):
+       def __init__(self, folder, config):
                self.folder = folder
-               self.name = module['name']
+               self.name = config['name']
                # VCS
-               vcsName = module['vcs']
+               vcsName = config['vcs']
                if vcsName == 'git':
-                       self.vcs = vcs.Git(self.sourceFolder(), module['url'], module['version'])
+                       self.vcs = vcs.Git(self.sourceFolder(), config['url'], config['version'])
                elif vcsName == 'svn':
-                       self.vcs = vcs.SVN(self.sourceFolder(), module['url'], module.get('versionName'))
+                       self.vcs = vcs.SVN(self.sourceFolder(), config['url'], config.get('versionName'))
                else:
                        raise Exception("Unknown VCS type "+vcsName)
                # build system
                if config.get('buildDeb', False):
-                       self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), module, self.vcs, config)
+                       self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), config, self.vcs)
                else:
-                       buildSystemName = module['buildSystem']
+                       buildSystemName = config['buildSystem']
                        if buildSystemName == 'cmake':
-                               self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), module, config)
+                               self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), config)
                        else:
                                raise Exception("Unknown build system type "+buildSystemName)
        
@@ -56,6 +32,37 @@ class Project:
        def buildFolder(self):
                return os.path.join(config['buildDir'], self.sourceFolder())
 
+# read command-line arguments
+parser = argparse.ArgumentParser(description='Update and build a bunch of stuff')
+parser.add_argument("-c, --config",
+                    dest="config", default="mass-build.conf",
+                    help="mass-build config file")
+parser.add_argument("--reconfigure",
+                    action="store_true", dest="reconfigure",
+                    help="Force configuration to be run")
+parser.add_argument("--reset-source",
+                    action="store_true", dest="reset_source",
+                    help="Reset sourcecode to the given version (removes local changes!)")
+parser.add_argument("--no-update",
+                    action="store_false", dest="update",
+                    help="Do not update projects before compilation")
+parser.add_argument("--resume-from", metavar='PROJECT',
+                    dest="resume_from",
+                    help="Resume building from the given project")
+parser.add_argument("projects",  metavar='PROJECT', nargs='*',
+                    help="Manually specify projects or folders to be built (project names take precedence)")
+args = parser.parse_args()
+# sanitize
+if args.reset_source and not args.update:
+       raise Exception("When no update is performed, no reset to the given version can be done either")
+
+# load config
+config = imp.load_source('config', args.config).__dict__
+os.remove(args.config+'c') # remove compiled python file
+allProjects = OrderedDict() # all projects
+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)):
@@ -63,44 +70,63 @@ def findInList(list, item):
                        return i
        raise Exception("%s not found in list" % str(item))
 
-# populate list of projects
-def loadProjects(config, modules, folder=''):
-       for module in modules:
-               if 'folder' in module: # a subpath
-                       loadProjects(config, module['modules'], os.path.join(folder, module['folder']))
+# 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(config, folder=''):
+       folderProjects = []
+       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 module['name'] in projects:
-                               raise Exception("Duplicate module name "+module['name'])
-                       projects[module['name']] = Project(config, folder, module)
+                       if projectConfig['name'] in allProjects:
+                               raise Exception("Duplicate project name "+projectConfig['name'])
+                       project = Project(folder, projectConfig)
+                       allProjects[projectConfig['name']] = project
+                       folderProjects.append(project)
+       # store projects of this folder
+       if folder in allFolders:
+               raise Exception("Duplicate folder name "+folder)
+       allFolders[folder] = folderProjects
+       return folderProjects
 
 # now check what we have to do
-loadProjects(config, config['modules'])
-if args.modules:
+loadProjects(config)
+if args.projects:
        if args.resume_from is not None:
-               raise Exception("Can not use --resume-from and manually specify modules")
-       for module in args.modules:
-               if not module in projects:
-                       raise Exception("Project %s does not exist" % module)
-               workProjects.append(projects[module])
+               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
 else:
-       if not args.resume_from in projects:
+       if not args.resume_from in allProjects:
                raise Exception("Project %s does not exist" % args.resume_from)
-       startWith = projects[args.resume_from]
-       startIndex = findInList(projects.values(), startWith)
-       workProjects = projects.values()[startIndex:]
+       startWith = allProjects[args.resume_from]
+       startIndex = findInList(allProjects.values(), startWith)
+       workProjects = allProjects.values()[startIndex:]
 
 # and do it!
 for project in workProjects:
        try:
                if args.update:
-                       print "Updating module",project.sourceFolder()
-                       project.vcs.update()
-               print "Building module",project.sourceFolder()
+                       print "Updating project",project.sourceFolder()
+                       project.vcs.update(forceVersion=args.reset_source)
+               print "Building project",project.sourceFolder()
                project.buildSystem.build(reconfigure=args.reconfigure)
                print
-       except (subprocess.CalledProcessError, KeyboardInterrupt) as e:
+       except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
                print >> sys.stderr
                print >> sys.stderr
                if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string