Change --resume-from semantics: From the projects specified to build (which are all...

diff --git a/mass_build.py b/mass_build.py
index 385749f0df073afd01c3df7e5585fa8660f2e3a3..096d9a5834377a090fd5fb5c34fac5dada8b5654 100755 (executable)
--- a/mass_build.py
+++ b/mass_build.py
@@ -48,7 +48,7 @@ parser.add_argument("--no-update",
                     help="Do not update projects before compilation")
 parser.add_argument("--resume-from", metavar='PROJECT',
                     dest="resume_from",
                     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()
 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 +63,6 @@ allProjects = OrderedDict() # all projects
 allFolders = {} # all folders
 workProjects = [] # projects we work on
 
 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():
 # 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,11 +89,10 @@ def loadProjects(config, folder=''):
        allFolders[folder] = folderProjects
        return folderProjects
 
        allFolders[folder] = folderProjects
        return folderProjects
 

-# now check what we have to do
+# load available projects

 loadProjects(config)
 loadProjects(config)

+# get base set og projects to process

 if args.projects:
 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])
        for name in args.projects:
                if name in allProjects:
                        workProjects.append(allProjects[name])


@@ -108,14 +100,21 @@ if args.projects:
                        workProjects += allFolders[name]
                else:
                        raise Exception("Project or folder %s does not exist" % name)
                        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:
 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:
 
 # and do it!
 for project in workProjects: