On Fri, Feb 3, 2012 at 3:26 PM, Mike Frysinger <vap...@gentoo.org> wrote:
> please post it inline to make review easier
>
>> # @MAINTAINER: mozi...@gentoo.org
>> # @AUTHOR: Nirbheek Chauhan <nirbh...@gentoo.org>
>
> goes on newline, not inlined
>
Fixed
>> # @DESCRIPTION: Array containing the list of language pack xpis available
>
> text starts on the next line, not the existing line
>
Fixed
>> # @ECLASS-VARIABLE: LANGS
>> # @ECLASS-VARIABLE: LANGPACK_PREFIX
>> # @ECLASS-VARIABLE: LANGPACK_SUFFIX
>
> these prob could use MOZ prefixes as well
>
Fixed
>> : ${LANGS:=""}
>
> you say it's an array but then you initialize it to a string ...
>
Meh, no real difference. :p
Changed anyway!
>> if ! [[ ${PV} =~ alpha|beta ]]; then
>> for x in "${LANGS[@]}" ; do
>
> x is a global variable here ... one reason to write this as an internal func
> and then call it so you can use `local`
>
I just added an "unset x" at the end of the chunk, that should be
sufficient I think.
>> if [[ ${x} = en ]] || [[ ${x} = en-US ]]; then
>
> should be == imo
>
Fixed
>> SRC_URI="${SRC_URI}
>
> SRC_URI+="...
>
Fixed
>> IUSE="${IUSE} linguas_${x/-/_}"
>
> IUSE+="...
>
Fixed
>> mozlinguas() {
>
> missing eclass documentation
>
Is it really needed for private functions? Nothing should ever call this.
>> # Generate the list of language packs called "linguas"
>> # This list is used to unpack and install the xpi language packs
>
> shouldn't this initialize linguas=() ?
>
> and shouldn't it name the return value mozlinguas ?
>
Fixed, and renamed the function to mozlinguas_export()
>> # If this language is supported by ${P},
>> elif has ${lingua} "${LANGS[@]//-/_}"; then
>> # Add the language to linguas, if it isn't already
>> there
>> has ${lingua//_/-} "${linguas[@]}" ||
>> linguas+=(${lingua//_/-})
>> continue
>> # For each short lingua that isn't in LANGS,
>> # We used to add *all* long LANGS to the linguas list,
>> # but we stopped doing that due to bug 325195.
>> fi
>
> indentation on these comments seem to be off
>
No, that's on purpose. There used to be an `else` statement there.
That comment doesn't belong to the previous `elif` block. I've added
it outside a blank else block to clarify that.
>> # FIXME: Add support for unpacking xpis to portage
>> xpi_unpack "${MOZ_P}-${x}.xpi"
>
> or, add it to the new unpacker.eclass ;)
>
> also, seems to be missing `use linguas_${x} && xpi_unpack ...` ? otherwise,
> you just unpack all linguas and not just the ones the user has requested ...
> same goes for the install ...
>
No, "${mozlinguas[@]}" is already the intersection of MOZ_LANGS and LINGUAS.
>> if [[ "${linguas[*]}" != "" && "${linguas[*]}" != "en" ]]; then
>> einfo "Selected language packs (first will be default):
>> ${linguas[*]}"
>
> since linguas[*] will be big by default, i'd put the variable expansion into
> its own einfo
It's actually really small by default since it's the list of enabled langpacks.
Fixed version attached, thanks for the review!
--
~Nirbheek Chauhan
Gentoo GNOME+Mozilla Team
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# @ECLASS: mozlinguas.eclass
# @MAINTAINER:
# mozi...@gentoo.org
# @AUTHOR:
# Nirbheek Chauhan <nirbh...@gentoo.org>
# @BLURB: Handle language packs for mozilla products
# @DESCRIPTION:
# Sets IUSE according to MOZ_LANGS (language packs available). Also exports
# src_unpack and src_install for use in ebuilds.
inherit mozextension
case "${EAPI:-0}" in
0|1)
die "EAPI ${EAPI:-0} does not support the '->' SRC_URI
operator";;
2|3|4)
EXPORT_FUNCTIONS src_unpack src_install;;
*)
die "EAPI ${EAPI} is not supported, contact eclass
maintainers";;
esac
# @ECLASS-VARIABLE: MOZ_LANGS
# @DEFAULT-UNSET
# @DESCRIPTION:
# Array containing the list of language pack xpis available for
# this release. The list can be updated with scripts/get_langs.sh from the
# mozilla overlay.
: ${MOZ_LANGS:=()}
# @ECLASS-VARIABLE: MOZ_PV
# @DESCRIPTION:
# Ebuild package version converted to equivalent upstream version.
# Defaults to ${PV}, and should be overridden for alphas, betas, and RCs
: ${MOZ_PV:="${PV}"}
# @ECLASS-VARIABLE: MOZ_PN
# @DESCRIPTION:
# Ebuild package name converted to equivalent upstream name.
# Defaults to ${PN}, and should be overridden for binary ebuilds.
: ${MOZ_PN:="${PN}"}
# @ECLASS-VARIABLE: MOZ_P
# @DESCRIPTION:
# Ebuild package name + version converted to upstream equivalent.
# Defaults to ${MOZ_PN}-${MOZ_PV}
: ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}
# @ECLASS-VARIABLE: MOZ_FTP_URI
# @DEFAULT-UNSET
# @DESCRIPTION:
# The ftp URI prefix for the release tarballs and language packs.
: ${MOZ_FTP_URI:=""}
# @ECLASS-VARIABLE: MOZ_LANGPACK_PREFIX
# @DESCRIPTION:
# The relative path till the lang code in the langpack file URI.
# Defaults to ${MOZ_PV}/linux-i686/xpi/
: ${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"}
# @ECLASS-VARIABLE: MOZ_LANGPACK_SUFFIX
# @DESCRIPTION:
# The suffix after the lang code in the langpack file URI.
# Defaults to '.xpi'
: ${MOZ_LANGPACK_SUFFIX:=".xpi"}
# Add linguas_* to IUSE according to available language packs
# No language packs for alphas and betas
if ! [[ ${PV} =~ alpha|beta ]]; then
for x in "${MOZ_LANGS[@]}" ; do
# en and en_US are handled internally
if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then
continue
fi
SRC_URI+="
linguas_${x/-/_}?
(
${MOZ_FTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} ->
${MOZ_P}-${x}.xpi )"
IUSE+=" linguas_${x/-/_}"
# We used to do some magic if specific/generic locales were
missing, but
# we stopped doing that due to bug 325195.
done
fi
unset x
mozlinguas_export() {
[[ ${PV} =~ alpha|beta ]] && return
# Generate the list of language packs called "mozlinguas"
# This list is used to unpack and install the xpi language packs
local lingua
mozlinguas=()
for lingua in ${LINGUAS}; do
if has ${lingua} en en_US; then
# For mozilla products, en and en_US are handled
internally
continue
# If this language is supported by ${P},
elif has ${lingua} "${MOZ_LANGS[@]//-/_}"; then
# Add the language to mozlinguas, if it isn't already
there
has ${lingua//_/-} "${mozlinguas[@]}" ||
mozlinguas+=(${lingua//_/-})
continue
# For each short lingua that isn't in MOZ_LANGS,
# We used to add *all* long MOZ_LANGS to the mozlinguas list,
# but we stopped doing that due to bug 325195.
else
:
fi
ewarn "Sorry, but ${P} does not support the ${lingua} locale"
done
}
# @FUNCTION: mozlinguas_src_unpack
# @DESCRIPTION:
# Unpack xpi language packs according to the user's LINGUAS settings
mozlinguas_src_unpack() {
local x
mozlinguas_export
for x in "${mozlinguas[@]}"; do
# FIXME: Add support for unpacking xpis to portage
xpi_unpack "${MOZ_P}-${x}.xpi"
done
if [[ "${mozlinguas[*]}" != "" && "${mozlinguas[*]}" != "en" ]]; then
einfo "Selected language packs (first will be default):
${mozlinguas[*]}"
fi
}
# @FUNCTION: mozlinguas_src_install
# @DESCRIPTION:
# Install xpi language packs according to the user's LINGUAS settings
mozlinguas_src_install() {
local x
mozlinguas_export
for x in "${mozlinguas[@]}"; do
xpi_install "${WORKDIR}/${MOZ_P}-${x}"
done
}
