vala.eclass updated.
This commit is contained in:
parent
6d3105e315
commit
b9e0b10ae6
|
@ -1,6 +1,6 @@
|
|||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.8 2014/05/04 06:13:55 tetromino Exp $
|
||||
# $Id$
|
||||
|
||||
# @ECLASS: vala.eclass
|
||||
# @MAINTAINER:
|
||||
|
@ -26,13 +26,13 @@ esac
|
|||
|
||||
# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
|
||||
# @DESCRIPTION:
|
||||
# Minimum vala API version (e.g. 0.18).
|
||||
VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.18}
|
||||
# Minimum vala API version (e.g. 0.20).
|
||||
VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
|
||||
|
||||
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
|
||||
# @DESCRIPTION:
|
||||
# Maximum vala API version (e.g. 0.26).
|
||||
VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.26}
|
||||
# Maximum vala API version (e.g. 0.28).
|
||||
VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.28}
|
||||
|
||||
# @ECLASS-VARIABLE: VALA_USE_DEPEND
|
||||
# @DEFAULT_UNSET
|
||||
|
@ -44,7 +44,19 @@ VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.26}
|
|||
# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to
|
||||
# VALA_MIN_API_VERSION.
|
||||
vala_api_versions() {
|
||||
eval "echo 0.{${VALA_MAX_API_VERSION#0.}..${VALA_MIN_API_VERSION#0.}..2}"
|
||||
[[ ${VALA_MIN_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MIN_API_VERSION"
|
||||
[[ ${VALA_MAX_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MAX_API_VERSION"
|
||||
|
||||
local minimal_supported_minor_version minor_version
|
||||
|
||||
# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
|
||||
minimal_supported_minor_version="20"
|
||||
|
||||
for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
|
||||
if ((minor_version >= minimal_supported_minor_version)); then
|
||||
echo "0.${minor_version}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# @FUNCTION: vala_depend
|
||||
|
@ -53,15 +65,11 @@ vala_api_versions() {
|
|||
# VALA_MIN_API_VERSION
|
||||
vala_depend() {
|
||||
local u v versions=$(vala_api_versions)
|
||||
[[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
|
||||
[[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
|
||||
|
||||
echo -n "|| ("
|
||||
for v in ${versions}; do
|
||||
if [[ "$v" = "0.26" ]]; then
|
||||
echo -n " dev-lang/vala:${v}"
|
||||
else
|
||||
echo -n " dev-lang/vala:${v}${u}"
|
||||
fi
|
||||
echo -n " dev-lang/vala:${v}${u}"
|
||||
done
|
||||
echo " )"
|
||||
}
|
||||
|
@ -72,13 +80,9 @@ vala_depend() {
|
|||
# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
|
||||
vala_best_api_version() {
|
||||
local u v
|
||||
[[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
|
||||
[[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
|
||||
for v in $(vala_api_versions); do
|
||||
if [[ "$v" = "0.26" ]]; then
|
||||
has_version "dev-lang/vala:${v}" && echo "${v}" && return
|
||||
else
|
||||
has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
|
||||
fi
|
||||
has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
|
||||
done
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue