Set CMAKE_PREFIX_PATH environment variable during build, so that cmake finds the...

[mass-build.git] / mass_build.py

diff --git a/mass_build.py b/mass_build.py
index 6bbba4c23d8429e9b48c618ac6c94fbc73246cd1..800917d558bd3c6db6c9023fa8f4af0629cc5b89 100755 (executable)
--- a/mass_build.py
+++ b/mass_build.py
@@ -13,7 +13,7 @@ class Project:
                if vcsName == 'git':
                        self.vcs = vcs.Git(self.sourceFolder(), config['url'], config['version'])
                elif vcsName == 'svn':
-                       self.vcs = vcs.SVN(self.sourceFolder(), config['url'], config.get('versionName'))
+                       self.vcs = vcs.SVN(self.sourceFolder(), config['url'])
                else:
                        raise Exception("Unknown VCS type "+vcsName)
                # build system
@@ -40,6 +40,9 @@ parser.add_argument("-c, --config",
 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!)")
@@ -48,7 +51,7 @@ parser.add_argument("--no-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")
+                    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()
@@ -63,13 +66,6 @@ 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)):
-               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():
@@ -96,26 +92,32 @@ def loadProjects(config, folder=''):
        allFolders[folder] = folderProjects
        return folderProjects
 
-# now check what we have to do
+# 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:
@@ -124,7 +126,7 @@ 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