diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-gnome/recipes-gnome/abiword | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | ast2050-yocto-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.zip ast2050-yocto-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz |
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome/recipes-gnome/abiword')
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword.inc | 34 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword.inc b/meta-gnome/recipes-gnome/abiword/abiword.inc index 8fbcd3b..39c590c 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword.inc +++ b/meta-gnome/recipes-gnome/abiword/abiword.inc @@ -20,15 +20,15 @@ CVSSRC = "${WORKDIR}/abi" SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" FILES_${PN} += " \ - ${datadir}/icons/* \ - ${datadir}/mime-info \ - ${datadir}/abiword-${SHRT_VER}/glade \ - ${datadir}/abiword-${SHRT_VER}/system.profile-en \ - ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ - " + ${datadir}/icons/* \ + ${datadir}/mime-info \ + ${datadir}/abiword-${SHRT_VER}/glade \ + ${datadir}/abiword-${SHRT_VER}/system.profile-en \ + ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ +" -# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ -# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ +# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ +# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ inherit autotools pkgconfig @@ -40,10 +40,10 @@ PARALLEL_MAKE = "" # --disable-exports options EXTRA_OECONF = " --enable-embedded=poky \ - --disable-printing \ - --with-sys-wv \ - --disable-exports \ - --disable-spellcheck" + --disable-printing \ + --with-sys-wv \ + --disable-exports \ + --disable-spellcheck" # TODO -- refactor this, so that instead of two strings and profiles # packages we have lots of locale packages, each with a set of strings and @@ -51,14 +51,14 @@ EXTRA_OECONF = " --enable-embedded=poky \ # PACKAGES += " abiword-strings abiword-systemprofiles" -FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" -FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" +FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" +FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" # AbiWord configure.ac does not play nicely with autoreconf # so use the autogen.sh script that comes with AbiWord # do_configure() { - cd ${S} - export NOCONFIGURE="no"; ./autogen.sh - oe_runconf + cd ${S} + export NOCONFIGURE="no"; ./autogen.sh + oe_runconf } diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb index a2cd1cc..1aa88cb 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb @@ -50,9 +50,9 @@ do_configure() { } do_install_append() { - install -d ${D}${datadir}/pixmaps/ - mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ - rmdir ${D}${datadir}/icons + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ + rmdir ${D}${datadir}/icons } PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates " |