cubicweb: comparison devtools/devctl.py

equal deleted inserted replaced

-:112a04c0473d
+:61c4bdd70dd8
 import tempfile
 import yams
 from logilab.common.fileutils import ensure_fs_mode
 from logilab.common.shellutils import globfind, find, rm
 from logilab.common.modutils import get_module_files
-from cubicweb.i18n import extract_from_tal, execute
+from cubicweb.i18n import extract_from_tal, execute2
 tempdir = tempfile.mkdtemp(prefix='cw-')
 cwi18ndir = WebConfiguration.i18n_lib_dir()
-print '-> extract schema messages.'
+print '-> extract messages:',
+print 'schema',
 schemapot = osp.join(tempdir, 'schema.pot')
 potfiles = [schemapot]
 potfiles.append(schemapot)
 # explicit close necessary else the file may not be yet flushed when
 # we'll using it below
 schemapotstream = file(schemapot, 'w')
 generate_schema_pot(schemapotstream.write, cubedir=None)
 schemapotstream.close()
-print '-> extract TAL messages.'
+print 'TAL',
 tali18nfile = osp.join(tempdir, 'tali18n.py')
 extract_from_tal(find(osp.join(BASEDIR, 'web'), ('.py', '.pt')),
 tali18nfile)
 print '-> generate .pot files.'
 pyfiles = get_module_files(BASEDIR)
 ('schemadescr', schemafiles, None),
 ('yams', get_module_files(yams.__path__[0]), None),
 ('tal', [tali18nfile], None),
 ('js', jsfiles, 'java'),
 ]:
-cmd = 'xgettext --no-location --omit-header -k_ -o %s %s'
+potfile = osp.join(tempdir, '%s.pot' % id)
+cmd = ['xgettext', '--no-location', '--omit-header', '-k_']
 if lang is not None:
-cmd += ' -L %s' % lang
+cmd.extend(['-L', lang])
-potfile = osp.join(tempdir, '%s.pot' % id)
+cmd.extend(['-o', potfile])
-execute(cmd % (potfile, ' '.join('"%s"' % f for f in files)))
+cmd.extend(files)
+execute2(cmd)
 if osp.exists(potfile):
 potfiles.append(potfile)
 else:
 print '-> WARNING: %s file was not generated' % potfile
 print '-> merging %i .pot files' % len(potfiles)
 cubicwebpot = osp.join(tempdir, 'cubicweb.pot')
-execute('msgcat -o %s %s'
+cmd = ['msgcat', '-o', cubicwebpot] + potfiles
-% (cubicwebpot, ' '.join('"%s"' % f for f in potfiles)))
+execute2(cmd)
 print '-> merging main pot file with existing translations.'
 chdir(cwi18ndir)
 toedit = []
 for lang in CubicWebNoAppConfiguration.cw_languages():
 target = '%s.po' % lang
-execute('msgmerge -N --sort-output -o "%snew" "%s" "%s"'
+cmd = ['msgmerge', '-N', '--sort-output', '-o',
-% (target, target, cubicwebpot))
+target+'new', target, cubicwebpot]
+execute2(cmd)
 ensure_fs_mode(target)
 shutil.move('%snew' % target, target)
 toedit.append(osp.abspath(target))
 # cleanup
 rm(tempdir)
 if not update_cubes_catalogs(cubes):
 raise ExecutionError("update cubes i18n catalog failed")
 def update_cubes_catalogs(cubes):
+from subprocess import CalledProcessError
 for cubedir in cubes:
 if not osp.isdir(cubedir):
 print '-> ignoring %s that is not a directory.' % cubedir
 continue
 try:
 toedit = update_cube_catalogs(cubedir)
+except CalledProcessError, exc:
+print '\n*** error while updating catalogs for cube', cubedir
+print 'cmd:\n%s' % exc.cmd
+print 'stdout:\n%s\nstderr:\n%s' % exc.data
 except Exception:
 import traceback
 traceback.print_exc()
-print '-> error while updating catalogs for cube', cubedir
+print '*** error while updating catalogs for cube', cubedir
 return False
 else:
 # instructions pour la suite
 if toedit:
 print '-> regenerated .po catalogs for cube %s.' % cubedir
 def update_cube_catalogs(cubedir):
 import shutil
 import tempfile
 from logilab.common.fileutils import ensure_fs_mode
 from logilab.common.shellutils import find, rm
-from cubicweb.i18n import extract_from_tal, execute
+from cubicweb.i18n import extract_from_tal, execute2
 cube = osp.basename(osp.normpath(cubedir))
 tempdir = tempfile.mkdtemp()
 print underline_title('Updating i18n catalogs for cube %s' % cube)
 chdir(cubedir)
 if osp.exists(osp.join('i18n', 'entities.pot')):
 potfiles = [osp.join('i18n', 'entities.pot')]
 elif osp.exists(osp.join('i18n', 'static-messages.pot')):
 potfiles = [osp.join('i18n', 'static-messages.pot')]
 else:
 potfiles = []
-print '-> extract schema messages'
+print '-> extracting messages:',
+print 'schema',
 schemapot = osp.join(tempdir, 'schema.pot')
 potfiles.append(schemapot)
 # explicit close necessary else the file may not be yet flushed when
 # we'll using it below
 schemapotstream = file(schemapot, 'w')
 generate_schema_pot(schemapotstream.write, cubedir)
 schemapotstream.close()
-print '-> extract TAL messages'
+print 'TAL',
 tali18nfile = osp.join(tempdir, 'tali18n.py')
 ptfiles = find('.', ('.py', '.pt'), blacklist=STD_BLACKLIST+('test',))
 extract_from_tal(ptfiles, tali18nfile)
-print '-> extract Javascript messages'
+print 'Javascript'
 jsfiles =  [jsfile for jsfile in find('.', '.js')
 if osp.basename(jsfile).startswith('cub')]
 if jsfiles:
 tmppotfile = osp.join(tempdir, 'js.pot')
-execute('xgettext --no-location --omit-header -k_ -L java '
+cmd = ['xgettext', '--no-location', '--omit-header', '-k_', '-L', 'java',
-'--from-code=utf-8 -o %s %s' % (tmppotfile, ' '.join(jsfiles)))
+'--from-code=utf-8', '-o', tmppotfile] + jsfiles
+execute2(cmd)
 # no pot file created if there are no string to translate
 if osp.exists(tmppotfile):
 potfiles.append(tmppotfile)
-print '-> create cube-specific catalog'
+print '-> creating cube-specific catalog'
 tmppotfile = osp.join(tempdir, 'generated.pot')
 cubefiles = find('.', '.py', blacklist=STD_BLACKLIST+('test',))
 cubefiles.append(tali18nfile)
-execute('xgettext --no-location --omit-header -k_ -o %s %s'
+cmd = ['xgettext', '--no-location', '--omit-header', '-k_', '-o', tmppotfile]
-% (tmppotfile, ' '.join('"%s"' % f for f in cubefiles)))
+cmd.extend(cubefiles)
+execute2(cmd)
 if osp.exists(tmppotfile): # doesn't exists of no translation string found
 potfiles.append(tmppotfile)
 potfile = osp.join(tempdir, 'cube.pot')
-print '-> merging %i .pot files:' % len(potfiles)
+print '-> merging %i .pot files' % len(potfiles)
-execute('msgcat -o %s %s' % (potfile,
+cmd = ['msgcat', '-o', potfile]
-' '.join('"%s"' % f for f in potfiles)))
+cmd.extend(potfiles)
+execute2(cmd)
 if not osp.exists(potfile):
 print 'no message catalog for cube', cube, 'nothing to translate'
 # cleanup
 rm(tempdir)
 return ()
-print '-> merging main pot file with existing translations:'
+print '-> merging main pot file with existing translations:',
 chdir('i18n')
 toedit = []
 for lang in CubicWebNoAppConfiguration.cw_languages():
-print '-> language', lang
+print lang,
 cubepo = '%s.po' % lang
 if not osp.exists(cubepo):
 shutil.copy(potfile, cubepo)
 else:
-execute('msgmerge -N -s -o %snew %s %s' % (cubepo, cubepo, potfile))
+cmd = ['msgmerge','-N','-s','-o', cubepo+'new', cubepo, potfile]
+execute2(cmd)
 ensure_fs_mode(cubepo)
 shutil.move('%snew' % cubepo, cubepo)
 toedit.append(osp.abspath(cubepo))
+print
 # cleanup
 rm(tempdir)
 return toedit

changeset 8620	61c4bdd70dd8
parent 8544	3d049071957e
child 8665	e65af61bde7d