mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-28 15:36:13 +01:00
Code

add support for more build options

Browse Source 
--icecream
--ccache
--with
--without
This commit is contained in:
Ludwig Nussel 2008-12-11 11:36:07 +00:00
parent eb96e53784
commit e33b48f5b0
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osc/build.py
View File

@ -240,6 +240,7 @@ def main(opts, argv):
arch = argv[1] arch = argv[1]
build_descr = argv[2] build_descr = argv[2]
crossbuild = False crossbuild = False
xp = []
build_type = os.path.splitext(build_descr)[1][1:] build_type = os.path.splitext(build_descr)[1][1:]
if build_type not in ['spec', 'dsc', 'kiwi']: if build_type not in ['spec', 'dsc', 'kiwi']:
@ -260,10 +261,23 @@ def main(opts, argv):
buildargs.append('--changelog') buildargs.append('--changelog')
if opts.jobs: if opts.jobs:
buildargs.append('--jobs %s' % opts.jobs) buildargs.append('--jobs %s' % opts.jobs)
if opts.icecream:
buildargs.append('--icecream %s' % opts.icecream)
xp.append('icecream')
if opts.ccache:
buildargs.append('--ccache')
xp.append('ccache')
if opts.baselibs: if opts.baselibs:
buildargs.append('--baselibs') buildargs.append('--baselibs')
if opts.debuginfo: if opts.debuginfo:
buildargs.append('--debug') buildargs.append('--debug')
if opts._with:
buildargs.append('--with %s' % opts._with)
if opts.without:
buildargs.append('--without %s' % opts.without)
# FIXME: quoting
# if opts.define:
# buildargs.append('--define "%s"' % opts.define)
if opts.local_package: if opts.local_package:
pac = '_repository' pac = '_repository'
@ -299,6 +313,10 @@ def main(opts, argv):
else: else:
extra_pkgs = opts.extra_pkgs extra_pkgs = opts.extra_pkgs
if xp:
extra_pkgs += xp
print 'Getting buildinfo from server' print 'Getting buildinfo from server'
bi_file = NamedTemporaryFile(suffix='.xml', prefix='buildinfo.', dir = '/tmp') bi_file = NamedTemporaryFile(suffix='.xml', prefix='buildinfo.', dir = '/tmp')
try: try:

11
osc/commandline.py
View File

@ -1832,6 +1832,17 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='Add this package when installing the build-root') help='Add this package when installing the build-root')
@cmdln.option('-j', '--jobs', metavar='N', @cmdln.option('-j', '--jobs', metavar='N',
help='Compile with N jobs') help='Compile with N jobs')
@cmdln.option('--icecream', metavar='N',
help='use N parallel build jobs with icecream')
@cmdln.option('--ccache', action='store_true',
help='use ccache to speed up rebuilds')
@cmdln.option('--with', metavar='X', dest='_with',
help='enable feature X for build')
@cmdln.option('--without', metavar='X',
help='disable feature X for build')
# will not work as build.py does not support proper quoting
# @cmdln.option('--define', metavar='\'X Y\'',
# help='define macro X with value Y')
@cmdln.option('--userootforbuild', action='store_true', @cmdln.option('--userootforbuild', action='store_true',
help='Run build as root. The default is to build as ' help='Run build as root. The default is to build as '
'unprivileged user. Note that a line "# norootforbuild" ' 'unprivileged user. Note that a line "# norootforbuild" '