NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot: support v10-style manifest naming convention

Browse Source
This commit is contained in:
Olivier Dony 2016-09-02 19:23:02 +02:00
parent 10c3e87579
commit 48e652436e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot/runbot.py
View File

@ -803,7 +803,8 @@ class runbot_build(osv.osv):
if build.repo_id.modules_auto == 'repo': if build.repo_id.modules_auto == 'repo':
modules_to_test += [ modules_to_test += [
os.path.basename(os.path.dirname(a)) os.path.basename(os.path.dirname(a))
for a in glob.glob(build.path('*/__openerp__.py')) for a in (glob.glob(build.path('*/__openerp__.py')) +
glob.glob(build.path('*/__manifest__.py')))
] ]
_logger.debug("local modules_to_test for build %s: %s", build.dest, modules_to_test) _logger.debug("local modules_to_test for build %s: %s", build.dest, modules_to_test)
@ -822,7 +823,8 @@ class runbot_build(osv.osv):
# Finally mark all addons to move to openerp/addons # Finally mark all addons to move to openerp/addons
modules_to_move += [ modules_to_move += [
os.path.dirname(module) os.path.dirname(module)
for module in glob.glob(build.path('*/__openerp__.py')) for module in (glob.glob(build.path('*/__openerp__.py')) +
glob.glob(build.path('*/__manifest__.py')))
] ]
# move all addons to server addons path # move all addons to server addons path
@ -838,7 +840,8 @@ class runbot_build(osv.osv):
available_modules = [ available_modules = [
os.path.basename(os.path.dirname(a)) os.path.basename(os.path.dirname(a))
for a in glob.glob(build.server('addons/*/__openerp__.py')) for a in (glob.glob(build.server('addons/*/__openerp__.py')) +
glob.glob(build.server('addons/*/__manifest__.py')))
] ]
if build.repo_id.modules_auto == 'all' or (build.repo_id.modules_auto != 'none' and has_server): if build.repo_id.modules_auto == 'all' or (build.repo_id.modules_auto != 'none' and has_server):
modules_to_test += available_modules modules_to_test += available_modules