#!/usr/bin/python -u
-import sys, os
+import sys, os, os.path
import re
import time
import tempfile
"NodeUpdate": "nodeupdate",
"Monitor": "monitor",
- #we keep planetlab modules in a sub-directory
- "planetlab/PLEWWW": "planetlab/plewww",
- "planetlab/PLCAPI": "planetlab/plcapi",
- "planetlab/BootManager": "planetlab/bootmanager",
- "planetlab/BootCD": "planetlab/bootcd",
- "planetlab/VserverReference": "planetlab/vserver-reference",
- "planetlab/BootstrapFS": "planetlab/bootstrapfs",
- "planetlab/MyPLC": "planetlab/myplc",
- "planetlab/CoDemux": "planetlab/codemux",
- "planetlab/NodeManager": "planetlab/nodemanager",
- "planetlab/NodeUpdate": "planetlab/nodeupdate"
-
}
def svn_to_git_name(module):
def name(self):
return os.path.basename(self.path)
+ def pathname(self):
+ # for svn modules pathname is just the name of the module as
+ # all modules are at the root
+ return self.name()
+
def url(self):
out = Command("svn info %s" % self.path, self.options).output_of()
for line in out.split('\n'):
def gitweb(self):
c = Command("git show | grep commit | awk '{print $2;}'", self.options)
out = self.__run_in_repo(c.output_of).strip()
- return "http://git.onelab.eu/?p=%s.git;a=commit;h=%s" % (self.pathname(), out)
+ return "http://git.onelab.eu/?p=%s.git;a=commit;h=%s" % (self.name(), out)
def repo_root(self):
c = Command("git remote show origin", self.options)
while not cls.config[key]:
cls.prompt_config_option(key, message, default)
- # for parsing module spec name:branch
- matcher_branch_spec=re.compile("\A(?P<name>[\w\.-\/]+):(?P<branch>[\w\.-]+)\Z")
- # special form for tagged module - for Build
- matcher_tag_spec=re.compile("\A(?P<name>[\w\.-\/]+)@(?P<tagname>[\w\.-]+)\Z")
+ # for parsing module spec name:branch
+ matcher_branch_spec=re.compile("\A(?P<name>[\w\.\-\/]+):(?P<branch>[\w\.\-]+)\Z")
+ # special form for tagged module - for Build
+ matcher_tag_spec=re.compile("\A(?P<name>[\w\.\-\/]+)@(?P<tagname>[\w\.\-]+)\Z")
# parsing specfiles
matcher_rpm_define=re.compile("%(define|global)\s+(\S+)\s+(\S*)\s*")
def release_changelog(options, buildtag_old, buildtag_new):
- tagfile = options.distrotags[0]
- if not tagfile:
+ try:
+ tagfile = options.distrotags[0]
+ if not tagfile: raise
+ except:
print "ERROR: provide a tagfile name (eg. onelab, onelab-k27, planetlab)"
return
- tagfile = "%s-tags.mk" % tagfile
+ # mmh, sounds wrong to blindly add the extension
+ # if in a build directory, guess from existing files
+ if os.path.isfile (tagfile):
+ pass
+ elif os.path.isfile ("%s-tags.mk" % tagfile):
+ tagfile="%s-tags.mk" % tagfile
+ else:
+ tagfile = "%s-tags.mk" % tagfile
print '----'
print '----'
print ' * to', second, m.repository.gitweb()
print '{{{'
- os.system("diff -u %s %s" % (tmpfile, specfile))
+ os.system("diff -u %s %s | sed -e 's,%s,[[previous version]],'" % (tmpfile, specfile,tmpfile))
print '}}}'
os.unlink(tmpfile)
print '=== %s : removed package from build %s ===' % (tagfile, module)
-def adopt_master (options, args):
+def adopt_tag (options, args):
modules=[]
for module in options.modules:
modules += module.split()
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)
+ print 'adopting tag %s for %s in %s'%(options.tag,module,tags_file)
+ modobj.patch_tags_file(tags_file,'_unused_',options.tag,fine_grain=False)
if options.verbose:
Command("git diff %s"%" ".join(args),options).run()
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
+ adopt_usage="""Usage: %prog [options] tag-file[s]
+ With this command you can adopt a specifi tag or branch 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
+ adopt-tag -m "plewww plcapi" -m Monitor onelab*tags.mk
+ adopt-tag -m sfa -t sfa-1.0-33 *tags.mk
"""
common_usage="""More help:
see http://svn.planet-lab.org/wiki/ModuleTools"""
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""",
+ 'adopt' : """locally adopt a specific tag""",
}
silent_modes = ['list']
# 'changelog' is for release-changelog
- # 'master' is for 'adopt-master'
- regular_modes = set(modes.keys()).difference(set(['changelog','master']))
+ # 'adopt' is for 'adopt-tag'
+ regular_modes = set(modes.keys()).difference(set(['changelog','adopt']))
@staticmethod
def optparse_list (option, opt, value, parser):
def run(self):
mode=None
- for function in Main.modes.keys():
+ # hack - need to check for adopt first as 'adopt-tag' contains tag..
+ for function in [ 'adopt' ] + Main.modes.keys():
if sys.argv[0].find(function) >= 0:
mode = function
break
elif mode=='changelog':
usage = Main.release_usage
usage += Main.common_usage
- elif mode=='master':
- usage = Main.master_usage
+ elif mode=='adopt':
+ usage = Main.adopt_usage
usage += Main.common_usage
parser=OptionParser(usage=usage)
- # the 'master' mode is really special and doesn't share any option
- if mode=='master':
+ # the 'adopt' mode is really special and doesn't share any option
+ if mode=='adopt':
parser.add_option("-m","--module",action="append",dest="modules",default=[],
help="modules, can be used several times or with quotes")
+ parser.add_option("-t","--tag",action="store", dest="tag", default='master',
+ help="specify the tag to adopt, default is 'master'")
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'
+ options.mode='adopt'
if len(args)==0 or len(options.modules)==0:
parser.print_help()
sys.exit(1)
- adopt_master (options,args)
+ adopt_tag (options,args)
return
# the other commands (module-* and release-changelog) share the same skeleton
parser.add_option("-c","--no-changelog", action="store_false", dest="changelog", default=True,
help="do not update changelog section in specfile when tagging")
parser.add_option("-b","--build-branch", action="store", dest="build_branch", default=None,
- help="specify a build branch; used for locating the *tags*.mk files where adoption is to take place")
+ help="specify a build branch; used for locating the *tags.mk files where adoption is to take place")
if mode == "tag" or mode == "sync" :
parser.add_option("-e","--editor", action="store", dest="editor", default=default_editor(),
help="specify editor")
module.html_dump_body()
Module.html_dump_footer()
else:
- release_changelog(options, *args)
+ # if we provide, say a b c d, we want to build (a,b) (b,c) and (c,d)
+ # remember that the changelog in the twiki comes latest first, so
+ # we typically have here latest latest-1 latest-2
+ for (tag_to,tag_from) in zip ( args[:-1], args [1:]):
+ release_changelog(options, tag_from,tag_to)
####################
git://git.onelab.eu / build.git / blobdiff