X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=module-tools.py;h=e7c17c169fb5ef16b2b5de1704538b75b7c1bc34;hb=6a06e995b2a296461ce0a751b28882f03339feb9;hp=10ce4284b8320c1bd81ff24a1edc22d8e375bfa2;hpb=2d5b37570d499af2f1d5574fbc5dd89eebe5594f;p=build.git diff --git a/module-tools.py b/module-tools.py index 10ce4284..e7c17c16 100755 --- a/module-tools.py +++ b/module-tools.py @@ -21,7 +21,8 @@ RENAMED_SVN_MODULES = { "MyPLC": "myplc", "CoDemux": "codemux", "NodeManager": "nodemanager", - "NodeUpdate": "nodeupdate" + "NodeUpdate": "nodeupdate", + "Monitor": "monitor" } def svn_to_git_name(module): @@ -643,7 +644,6 @@ that for other purposes than tagging""" % options.workdir elif self.repository.type == "git": if hasattr(self,'branch'): - print "to branch", self.branch self.repository.to_branch(self.branch) elif hasattr(self,'tagname'): self.repository.to_tag(self.tagname) @@ -1238,6 +1238,9 @@ def modules_diff(first, second): diff = {} for module in first: + if module not in second: + print "=== module %s missing in right-hand side ==="%module + continue if first[module]['tag_or_branch'] != second[module]['tag_or_branch']: diff[module] = (first[module]['tag_or_branch'], second[module]['tag_or_branch']) @@ -1249,8 +1252,17 @@ def modules_diff(first, second): return diff, new_modules, removed_modules -def release_changelog(options, buildtag_old, buildtag_new, tagfile): +def release_changelog(options, buildtag_old, buildtag_new): + + tagfile = options.distrotags[0] + if not tagfile: + print "ERROR: provide a tagfile name (eg. onelab, onelab-k27, planetlab)" + return + tagfile = "%s-tags.mk" % tagfile + print '----' + print '----' + print '----' print '= build tag %s to %s =' % (buildtag_old, buildtag_new) print '== distro %s (%s to %s) ==' % (tagfile, buildtag_old, buildtag_new) @@ -1258,42 +1270,49 @@ def release_changelog(options, buildtag_old, buildtag_new, tagfile): build.init_module_dir() first = build.get_modules(tagfile) - print '* from', buildtag_old, build.repository.gitweb() + print ' * from', buildtag_old, build.repository.gitweb() build = Build("build@%s" % buildtag_new, options) build.init_module_dir() second = build.get_modules(tagfile) - print '* to', buildtag_new, build.repository.gitweb() + print ' * to', buildtag_new, build.repository.gitweb() diff, new_modules, removed_modules = modules_diff(first, second) - for module in diff: + def get_module(name, tag): + if not tag or tag == "trunk": + return Module("%s" % (module), options) + else: + return Module("%s@%s" % (module, tag), options) + + + for module in diff: print '=== %s - %s to %s : package %s ===' % (tagfile, buildtag_old, buildtag_new, module) first, second = diff[module] - m = Module("%s@%s" % (module, first), options) - os.system('rm -rf %s' % m.module_dir) + m = get_module(module, first) + os.system('rm -rf %s' % m.module_dir) # cleanup module dir m.init_module_dir() if m.repository.type == "svn": - print '* from', first, m.repository.url() + print ' * from', first, m.repository.url() else: - print '* from', first, m.repository.gitweb() + print ' * from', first, m.repository.gitweb() specfile = m.main_specname() (tmpfd, tmpfile) = tempfile.mkstemp() os.system("cp -f /%s %s" % (specfile, tmpfile)) - m = Module("%s@%s" % (module, second), options) + m = get_module(module, second) m.init_module_dir() specfile = m.main_specname() if m.repository.type == "svn": - print '* to', second, m.repository.url() + print ' * to', second, m.repository.url() else: - print '* to', second, m.repository.gitweb() + print ' * to', second, m.repository.gitweb() print '{{{' os.system("diff -u %s %s" % (tmpfile, specfile)) @@ -1308,6 +1327,19 @@ def release_changelog(options, buildtag_old, buildtag_new, tagfile): print '=== %s : removed package from build %s ===' % (tagfile, module) +def adopt_master (options, args): + modules=[] + for module in options.modules: + modules += module.split() + for module in modules: + modobj=Module(module,options) + for tags_file in args: + if options.verbose: + print 'adopting master for',module,'in',tags_file + modobj.patch_tags_file(tags_file,'_unused_','master',fine_grain=False) + if options.verbose: + Command("git diff %s"%" ".join(args),options).run() + ############################## class Main: @@ -1333,6 +1365,12 @@ Branches: release-changelog :4.2 4.2-rc25 You can refer to the build trunk by just mentioning 'trunk', e.g. release-changelog -t coblitz-tags.mk coblitz-2.01-rc6 trunk +""" + master_usage="""Usage: %prog [options] tag-file[s] + With this command you can adopt one or several masters in your tag files + This should be run in your daily build workdir; no call of git nor svn is done + Examples: + module-master -m "plewww plcapi" -m Monitor onelab*tags.mk """ common_usage="""More help: see http://svn.planet-lab.org/wiki/ModuleTools""" @@ -1350,10 +1388,13 @@ Branches: this is a last resort option, mostly for repairs""", 'changelog' : """extract changelog between build tags expected arguments are a list of tags""", + 'master' : """locally adopt master or trunk for some modules""", } silent_modes = ['list'] - release_modes = ['changelog'] + # 'changelog' is for release-changelog + # 'master' is for 'adopt-master' + regular_modes = set(modes.keys()).difference(set(['changelog','master'])) @staticmethod def optparse_list (option, opt, value, parser): @@ -1374,16 +1415,37 @@ Branches: print "Supported commands:" + " ".join(Main.modes.keys()) sys.exit(1) - if mode not in Main.release_modes: + usage='undefined usage, mode=%s'%mode + if mode in Main.regular_modes: usage = Main.module_usage usage += Main.common_usage usage += "\nmodule-%s : %s"%(mode,Main.modes[mode]) - else: + elif mode=='changelog': usage = Main.release_usage usage += Main.common_usage + elif mode=='master': + usage = Main.master_usage + usage += Main.common_usage parser=OptionParser(usage=usage) + # the 'master' mode is really special and doesn't share any option + if mode=='master': + parser.add_option("-m","--module",action="append",dest="modules",default=[], + help="modules, can be used several times or with quotes") + parser.add_option("-v","--verbose", action="store_true", dest="verbose", default=False, + help="run in verbose mode") + (options, args) = parser.parse_args() + options.workdir='unused' + options.dry_run=False + options.mode='master' + if len(args)==0 or len(options.modules)==0: + parser.print_help() + sys.exit(1) + adopt_master (options,args) + return + + # the other commands (module-* and release-changelog) share the same skeleton if mode == "tag" or mode == 'branch': parser.add_option("-s","--set-version",action="store",dest="new_version",default=None, help="set new version and reset taglevel to 0") @@ -1440,6 +1502,8 @@ Branches: options.www=False options.debug=False + + ########## module-* if len(args) == 0: if options.all_modules: @@ -1452,7 +1516,7 @@ Branches: Module.init_homedir(options) - if mode not in Main.release_modes: + if mode in Main.regular_modes: modules=[ Module(modname,options) for modname in args ] # hack: create a dummy Module to store errors/warnings error_module = Module('__errors__',options)