diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-11 17:33:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 10:24:50 +0100 |
| commit | bfd279de3275abbfaf3e630383ec244131e0375f (patch) | |
| tree | 0d1c90461a890d21444f5d2afb13c52b302427f1 /meta/recipes-qt | |
| parent | 99203edda6f0b09d817454d656c100b7a8806b18 (diff) | |
| download | poky-bfd279de3275abbfaf3e630383ec244131e0375f.tar.gz | |
Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 22 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 100 |
2 files changed, 61 insertions, 61 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb index df18f91c90..ebaced4247 100644 --- a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | |||
| @@ -30,23 +30,23 @@ PACKAGES_DYNAMIC = "qmmp-plugin-* " | |||
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | python populate_packages_prepend () { | 32 | python populate_packages_prepend () { |
| 33 | import os | 33 | import os |
| 34 | qmmp_libdir = d.expand('${libdir}/qmmp') | 34 | qmmp_libdir = d.expand('${libdir}/qmmp') |
| 35 | gd = d.expand('${D}/${libdir}/qmmp') | 35 | gd = d.expand('${D}/${libdir}/qmmp') |
| 36 | plug_dirs = os.listdir(gd) | 36 | plug_dirs = os.listdir(gd) |
| 37 | 37 | ||
| 38 | for plug_dir in plug_dirs: | 38 | for plug_dir in plug_dirs: |
| 39 | g_plug_dir = os.path.join(qmmp_libdir,plug_dir) | 39 | g_plug_dir = os.path.join(qmmp_libdir,plug_dir) |
| 40 | do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp' + plug_dir + 'plugin for %s') | 40 | do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp' + plug_dir + 'plugin for %s') |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | FILES_${PN} = "\ | 43 | FILES_${PN} = "\ |
| 44 | ${bindir}/qmmp \ | 44 | ${bindir}/qmmp \ |
| 45 | ${libdir}/lib*${SOLIBS} \ | 45 | ${libdir}/lib*${SOLIBS} \ |
| 46 | ${datadir}/icons/* \ | 46 | ${datadir}/icons/* \ |
| 47 | ${datadir}/qmmp/images/* \ | 47 | ${datadir}/qmmp/images/* \ |
| 48 | ${datadir}/applications/* \ | 48 | ${datadir}/applications/* \ |
| 49 | " | 49 | " |
| 50 | 50 | ||
| 51 | FILES_${PN}-dbg += "\ | 51 | FILES_${PN}-dbg += "\ |
| 52 | ${libdir}/qmmp/*/.debug/* \ | 52 | ${libdir}/qmmp/*/.debug/* \ |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 23fda336b2..3f61a20a2c 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
| @@ -274,59 +274,59 @@ do_compile() { | |||
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | python populate_packages_prepend() { | 276 | python populate_packages_prepend() { |
| 277 | translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/') | 277 | translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/') |
| 278 | translation_name = d.expand('${QT_BASE_NAME}-translation-%s') | 278 | translation_name = d.expand('${QT_BASE_NAME}-translation-%s') |
| 279 | do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) | 279 | do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) |
| 280 | 280 | ||
| 281 | phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/') | 281 | phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/') |
| 282 | phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s') | 282 | phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s') |
| 283 | import os; | 283 | import os; |
| 284 | if os.path.exists("%s%s" % (d.expand('${D}'), phrasebook_dir)): | 284 | if os.path.exists("%s%s" % (d.expand('${D}'), phrasebook_dir)): |
| 285 | do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) | 285 | do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) |
| 286 | else: | 286 | else: |
| 287 | bb.note("The path does not exist:", d.expand('${D}'), phrasebook_dir) | 287 | bb.note("The path does not exist:", d.expand('${D}'), phrasebook_dir) |
| 288 | 288 | ||
| 289 | # Package all the plugins and their -dbg version and create a meta package | 289 | # Package all the plugins and their -dbg version and create a meta package |
| 290 | def qtopia_split(path, name, glob): | 290 | def qtopia_split(path, name, glob): |
| 291 | """ | 291 | """ |
| 292 | Split the package into a normal and -dbg package and then add the | 292 | Split the package into a normal and -dbg package and then add the |
| 293 | new packages to the meta package. | 293 | new packages to the meta package. |
| 294 | """ | 294 | """ |
| 295 | plugin_dir = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path) | 295 | plugin_dir = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path) |
| 296 | if not os.path.exists("%s%s" % (d.expand('${D}'), plugin_dir)): | 296 | if not os.path.exists("%s%s" % (d.expand('${D}'), plugin_dir)): |
| 297 | bb.note("The path does not exist:", d.expand('${D}'), plugin_dir) | 297 | bb.note("The path does not exist:", d.expand('${D}'), plugin_dir) |
| 298 | return | 298 | return |
| 299 | 299 | ||
| 300 | plugin_name = d.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name) | 300 | plugin_name = d.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name) |
| 301 | dev_packages = [] | 301 | dev_packages = [] |
| 302 | dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) | 302 | dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) |
| 303 | do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) | 303 | do_split_packages(d, plugin_dir, glob, plugin_name, '${PN} %s for %%s' % name, extra_depends='', hook=dev_hook) |
| 304 | # Create a -dbg package as well | 304 | # Create a -dbg package as well |
| 305 | plugin_dir_dbg = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path) | 305 | plugin_dir_dbg = d.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path) |
| 306 | packages = d.getVar('PACKAGES') | 306 | packages = d.getVar('PACKAGES') |
| 307 | for (file,package) in dev_packages: | 307 | for (file,package) in dev_packages: |
| 308 | packages = "%s %s-dbg" % (packages, package) | 308 | packages = "%s %s-dbg" % (packages, package) |
| 309 | file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) | 309 | file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) |
| 310 | d.setVar("FILES_%s-dbg" % package, file_name) | 310 | d.setVar("FILES_%s-dbg" % package, file_name) |
| 311 | d.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package)) | 311 | d.setVar("DESCRIPTION_%s-dbg" % package, "${PN} %s for %s" % (name, package)) |
| 312 | 312 | ||
| 313 | d.setVar('PACKAGES', packages) | 313 | d.setVar('PACKAGES', packages) |
| 314 | 314 | ||
| 315 | qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') | 315 | qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') |
| 316 | qtopia_split('codecs', 'codec', '^libq(.*)\.so$') | 316 | qtopia_split('codecs', 'codec', '^libq(.*)\.so$') |
| 317 | qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') | 317 | qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') |
| 318 | qtopia_split('designer', 'designer', '^lib(.*)\.so$') | 318 | qtopia_split('designer', 'designer', '^lib(.*)\.so$') |
| 319 | qtopia_split('gfxdrivers', 'gfxdriver', '^libq(.*)\.so$') | 319 | qtopia_split('gfxdrivers', 'gfxdriver', '^libq(.*)\.so$') |
| 320 | qtopia_split('graphicssystems','graphicssystems', '^libq(.*)\.so$') | 320 | qtopia_split('graphicssystems','graphicssystems', '^libq(.*)\.so$') |
| 321 | qtopia_split('mousedrivers', 'mousedriver', '^libq(.*)mousedriver\.so$') | 321 | qtopia_split('mousedrivers', 'mousedriver', '^libq(.*)mousedriver\.so$') |
| 322 | qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') | 322 | qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') |
| 323 | qtopia_split('imageformats', 'imageformat', '^libq(.*)\.so$') | 323 | qtopia_split('imageformats', 'imageformat', '^libq(.*)\.so$') |
| 324 | qtopia_split('inputmethods', 'inputmethod', '^libq(.*)\.so$') | 324 | qtopia_split('inputmethods', 'inputmethod', '^libq(.*)\.so$') |
| 325 | qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') | 325 | qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') |
| 326 | qtopia_split('script', 'script', '^libqtscript(.*)\.so$') | 326 | qtopia_split('script', 'script', '^libqtscript(.*)\.so$') |
| 327 | qtopia_split('styles', 'style', '^libq(.*)\.so$') | 327 | qtopia_split('styles', 'style', '^libq(.*)\.so$') |
| 328 | qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$') | 328 | qtopia_split('phonon_backend','phonon-backend','^libphonon_(.*)\.so$') |
| 329 | qtopia_split('bearer', 'bearer', '^libq(.*)bearer\.so$') | 329 | qtopia_split('bearer', 'bearer', '^libq(.*)bearer\.so$') |
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | do_install() { | 332 | do_install() { |
