/[gentoo-x86]/eclass/versionator.eclass
Gentoo

Diff of /eclass/versionator.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.2 Revision 1.20
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2008 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.2 2004/09/10 21:42:21 ciaranm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/versionator.eclass,v 1.20 2011/11/22 18:42:10 vapier Exp $
4# 4
5# Original Author: Ciaran McCreesh <ciaranm@gentoo.org> 5# @ECLASS: versionator.eclass
6# 6# @MAINTAINER:
7# Jonathan Callen <abcd@gentoo.org>
8# base-system@gentoo.org
9# @BLURB: functions which simplify manipulation of ${PV} and similar version strings
10# @DESCRIPTION:
7# This eclass provides functions which simplify manipulating $PV and similar 11# This eclass provides functions which simplify manipulating $PV and similar
8# variables. Most functions default to working with $PV, although other 12# variables. Most functions default to working with $PV, although other
9# values can be used. 13# values can be used.
10# 14# @EXAMPLE:
11# Simple Example 1: $PV is 1.2.3b, we want 1_2.3b: 15# Simple Example 1: $PV is 1.2.3b, we want 1_2.3b:
12# MY_PV=$(replace_version_separator 1 '_' ) 16# MY_PV=$(replace_version_separator 1 '_' )
13# 17#
14# Simple Example 2: $PV is 1.4.5, we want 1: 18# Simple Example 2: $PV is 1.4.5, we want 1:
15# MY_MAJORV=$(get_major_version ) 19# MY_MAJORV=$(get_major_version )
16# 20#
17# Full list of user usable functions provided by this eclass (see the functions 21# Rather than being a number, the index parameter can be a separator character
18# themselves for documentation): 22# such as '-', '.' or '_'. In this case, the first separator of this kind is
19# get_all_version_components ver_str 23# selected.
20# get_version_components ver_str
21# get_major_version ver_str
22# get_version_component_range range ver_str
23# get_after_major_version ver_str
24# replace_version_separator index newvalue ver_str
25# replace_all_version_separators newvalue ver_str
26# 24#
27# There's also: 25# There's also:
28# version_is_at_least want have 26# version_is_at_least want have
29# but it's *really* experimental... 27# which may be buggy, so use with caution.
30 28
31ECLASS=versionator 29inherit eutils
32INHERITED="$INHERITED $ECLASS"
33 30
34shopt -s extglob 31# @FUNCTION: get_all_version_components
35 32# @USAGE: [version]
33# @DESCRIPTION:
36# Split up a version string into its component parts. If no parameter is 34# Split up a version string into its component parts. If no parameter is
37# supplied, defaults to $PV. 35# supplied, defaults to $PV.
38# 0.8.3 -> 0 . 8 . 3 36# 0.8.3 -> 0 . 8 . 3
39# 7c -> 7 c 37# 7c -> 7 c
40# 3.0_p2 -> 3 . 0 _ p2 38# 3.0_p2 -> 3 . 0 _ p2
41# 20040905 -> 20040905 39# 20040905 -> 20040905
42# 3.0c-r1 -> 3 . 0 c - r1 40# 3.0c-r1 -> 3 . 0 c - r1
43get_all_version_components() { 41get_all_version_components() {
42 eshopts_push -s extglob
44 local ver_str=${1:-${PV}} result result_idx=0 43 local ver_str=${1:-${PV}} result
45 result=( ) 44 result=()
46 45
47 # sneaky cache trick cache to avoid having to parse the same thing several 46 # sneaky cache trick cache to avoid having to parse the same thing several
48 # times. 47 # times.
49 if [[ "${VERSIONATOR_CACHE_VER_STR}" == "${ver_str}" ]] ; then 48 if [[ ${VERSIONATOR_CACHE_VER_STR} == ${ver_str} ]] ; then
50 echo ${VERSIONATOR_CACHE_RESULT} 49 echo ${VERSIONATOR_CACHE_RESULT}
50 eshopts_pop
51 return 51 return
52 fi 52 fi
53 export VERSIONATOR_CACHE_VER_STR="${ver_str}" 53 export VERSIONATOR_CACHE_VER_STR=${ver_str}
54 54
55 while [[ -n "$ver_str" ]] ; do 55 while [[ -n $ver_str ]] ; do
56 case "${ver_str:0:1}" in 56 case "${ver_str::1}" in
57 # number: parse whilst we have a number 57 # number: parse whilst we have a number
58 [[:digit:]]) 58 [[:digit:]])
59 result[$result_idx]="${ver_str%%[^[:digit:]]*}" 59 result+=("${ver_str%%[^[:digit:]]*}")
60 ver_str="${ver_str##+([[:digit:]])}" 60 ver_str=${ver_str##+([[:digit:]])}
61 result_idx=$(($result_idx + 1))
62 ;; 61 ;;
63 62
64 # separator: single character 63 # separator: single character
65 [-_.]) 64 [-_.])
66 result[$result_idx]="${ver_str:0:1}" 65 result+=("${ver_str::1}")
67 ver_str="${ver_str:1}" 66 ver_str=${ver_str:1}
68 result_idx=$(($result_idx + 1))
69 ;; 67 ;;
70 68
71 # letter: grab the letters plus any following numbers 69 # letter: grab the letters plus any following numbers
72 [[:alpha:]]) 70 [[:alpha:]])
73 local not_match="${ver_str##+([[:alpha:]])*([[:digit:]])}" 71 local not_match=${ver_str##+([[:alpha:]])*([[:digit:]])}
72 # Can't say "${ver_str::-${#not_match}}" in Bash 3.2
74 result[$result_idx]=${ver_str:0:$((${#ver_str} - ${#not_match}))} 73 result+=("${ver_str::${#ver_str} - ${#not_match}}")
75 ver_str="${not_match}" 74 ver_str=${not_match}
76 result_idx=$(($result_idx + 1))
77 ;; 75 ;;
78 76
79 # huh? 77 # huh?
80 *) 78 *)
81 result[$result_idx]="${ver_str:0:1}" 79 result+=("${ver_str::1}")
82 ver_str="${ver_str:1}" 80 ver_str=${ver_str:1}
83 result_idx=$(($result_idx + 1))
84 ;; 81 ;;
85 esac 82 esac
86 done 83 done
87 84
88 export VERSIONATOR_CACHE_RESULT="${result[@]}" 85 export VERSIONATOR_CACHE_RESULT=${result[*]}
89 echo ${result[@]} 86 echo ${result[@]}
87 eshopts_pop
90} 88}
91 89
90# @FUNCTION: get_version_components
91# @USAGE: [version]
92# @DESCRIPTION:
92# Get the important version components, excluding '.', '-' and '_'. Defaults to 93# Get the important version components, excluding '.', '-' and '_'. Defaults to
93# $PV if no parameter is supplied. 94# $PV if no parameter is supplied.
94# 0.8.3 -> 0 8 3 95# 0.8.3 -> 0 8 3
95# 7c -> 7 c 96# 7c -> 7 c
96# 3.0_p2 -> 3 0 p2 97# 3.0_p2 -> 3 0 p2
97# 20040905 -> 20040905 98# 20040905 -> 20040905
98# 3.0c-r1 -> 3 0 c r1 99# 3.0c-r1 -> 3 0 c r1
99get_version_components() { 100get_version_components() {
100 local c="$(get_all_version_components "${1:-${PV}}")" 101 local c=$(get_all_version_components "${1:-${PV}}")
101 c=( ${c[@]//[-._]/ } ) 102 echo ${c//[-._]/ }
102 echo ${c[@]}
103} 103}
104 104
105# @FUNCTION: get_major_version
106# @USAGE: [version]
107# @DESCRIPTION:
105# Get the major version of a value. Defaults to $PV if no parameter is supplied. 108# Get the major version of a value. Defaults to $PV if no parameter is supplied.
106# 0.8.3 -> 0 109# 0.8.3 -> 0
107# 7c -> 7 110# 7c -> 7
108# 3.0_p2 -> 3 111# 3.0_p2 -> 3
109# 20040905 -> 20040905 112# 20040905 -> 20040905
110# 3.0c-r1 -> 3 113# 3.0c-r1 -> 3
111get_major_version() { 114get_major_version() {
112 local c
113 c=( $(get_all_version_components "${1:-${PV}}" ) ) 115 local c=($(get_all_version_components "${1:-${PV}}"))
114 echo ${c[0]} 116 echo ${c[0]}
115} 117}
116 118
119# @FUNCTION: get_version_component_range
120# @USAGE: <range> [version]
121# @DESCRIPTION:
117# Get a particular component or range of components from the version. If no 122# Get a particular component or range of components from the version. If no
118# version parameter is supplied, defaults to $PV. 123# version parameter is supplied, defaults to $PV.
119# 1 1.2.3 -> 1 124# 1 1.2.3 -> 1
120# 1-2 1.2.3 -> 1.2 125# 1-2 1.2.3 -> 1.2
121# 2- 1.2.3 -> 2.3 126# 2- 1.2.3 -> 2.3
122get_version_component_range() { 127get_version_component_range() {
128 eshopts_push -s extglob
123 local c v="${2:-${PV}}" range="${1}" range_start range_end i=-1 j=0 129 local c v="${2:-${PV}}" range="${1}" range_start range_end
130 local -i i=-1 j=0
124 c=( $(get_all_version_components ${v} ) ) 131 c=($(get_all_version_components "${v}"))
125 range_start="${range%-*}" ; range_start="${range_start:-1}" 132 range_start=${range%-*}; range_start=${range_start:-1}
126 range_end="${range#*-}" ; range_end="${range_end:-${#c[@]}}" 133 range_end=${range#*-} ; range_end=${range_end:-${#c[@]}}
127 134
128 while (( j < ${range_start} )) ; do 135 while ((j < range_start)); do
129 i=$(($i + 1)) 136 i+=1
130 [[ $i -gt ${#c[@]} ]] && return 137 ((i > ${#c[@]})) && eshopts_pop && return
131 [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) 138 [[ -n "${c[i]//[-._]}" ]] && j+=1
132 done 139 done
133 140
134 while (( j <= ${range_end} )) ; do 141 while ((j <= range_end)); do
135 echo -n ${c[$i]} 142 echo -n ${c[i]}
136 [[ $i -gt ${#c[@]} ]] && return 143 ((i > ${#c[@]})) && eshopts_pop && return
137 [[ -n "${c[${i}]//[-._]}" ]] && j=$(($j + 1)) 144 [[ -n "${c[i]//[-._]}" ]] && j+=1
138 i=$(($i + 1)) 145 i+=1
139 done 146 done
147 eshopts_pop
140} 148}
141 149
150# @FUNCTION: get_after_major_version
151# @USAGE: [version]
152# @DESCRIPTION:
142# Get everything after the major version and its separator (if present) of a 153# Get everything after the major version and its separator (if present) of a
143# value. Defaults to $PV if no parameter is supplied. 154# value. Defaults to $PV if no parameter is supplied.
144# 0.8.3 -> 8.3 155# 0.8.3 -> 8.3
145# 7c -> c 156# 7c -> c
146# 3.0_p2 -> 0_p2 157# 3.0_p2 -> 0_p2
147# 20040905 -> (empty string) 158# 20040905 -> (empty string)
148# 3.0c-r1 -> 0c-r1 159# 3.0c-r1 -> 0c-r1
149get_after_major_version() { 160get_after_major_version() {
150 echo $(get_version_component_range 2- "${1:-PV}" ) 161 echo $(get_version_component_range 2- "${1:-${PV}}")
151} 162}
152 163
164# @FUNCTION: replace_version_separator
165# @USAGE: <search> <replacement> [subject]
166# @DESCRIPTION:
153# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not 167# Replace the $1th separator with $2 in $3 (defaults to $PV if $3 is not
154# supplied). If there are fewer than $1 separators, don't change anything. 168# supplied). If there are fewer than $1 separators, don't change anything.
155# 1 '_' 1.2.3 -> 1_2.3 169# 1 '_' 1.2.3 -> 1_2.3
156# 2 '_' 1.2.3 -> 1.2_3 170# 2 '_' 1.2.3 -> 1.2_3
157# 1 '_' 1b-2.3 -> 1b_2.3 171# 1 '_' 1b-2.3 -> 1b_2.3
172# Rather than being a number, $1 can be a separator character such as '-', '.'
173# or '_'. In this case, the first separator of this kind is selected.
158replace_version_separator() { 174replace_version_separator() {
175 eshopts_push -s extglob
159 local i c found=0 v="${3:-${PV}}" 176 local w c v="${3:-${PV}}"
177 declare -i i found=0
178 w=${1:-1}
160 c=( $(get_all_version_components ${v} ) ) 179 c=($(get_all_version_components ${v}))
180 if [[ ${w} != *[[:digit:]]* ]] ; then
181 # it's a character, not an index
161 for (( i = 0 ; i < ${#c[@]} ; i = $i + 1 )) ; do 182 for ((i = 0; i < ${#c[@]}; i++)); do
162 if [[ -n "${c[${i}]//[^-._]}" ]] ; then 183 if [[ ${c[i]} == ${w} ]]; then
163 found=$(($found + 1))
164 if [[ "$found" == "${1:-1}" ]] ; then
165 c[${i}]="${2}" 184 c[i]=${2}
166 break 185 break
167 fi 186 fi
168 fi
169 done 187 done
188 else
189 for ((i = 0; i < ${#c[@]}; i++)); do
190 if [[ -n "${c[i]//[^-._]}" ]]; then
191 found+=1
192 if ((found == w)); then
193 c[i]=${2}
194 break
195 fi
196 fi
197 done
198 fi
170 c=${c[@]} 199 c=${c[*]}
171 echo ${c// } 200 echo ${c// }
201 eshopts_pop
172} 202}
173 203
204# @FUNCTION: replace_all_version_separators
205# @USAGE: <replacement> [subject]
206# @DESCRIPTION:
174# Replace all version separators in $2 (defaults to $PV) with $1. 207# Replace all version separators in $2 (defaults to $PV) with $1.
175# '_' 1b.2.3 -> 1b_2_3 208# '_' 1b.2.3 -> 1b_2_3
176replace_all_version_separators() { 209replace_all_version_separators() {
177 local c
178 c=( $(get_all_version_components "${2:-${PV}}" ) ) 210 local c=($(get_all_version_components "${2:-${PV}}"))
179 c="${c[@]//[-._]/$1}" 211 c=${c[@]//[-._]/$1}
180 echo ${c// } 212 echo ${c// }
181} 213}
182 214
215# @FUNCTION: delete_version_separator
216# @USAGE: <search> [subject]
217# @DESCRIPTION:
218# Delete the $1th separator in $2 (defaults to $PV if $2 is not supplied). If
219# there are fewer than $1 separators, don't change anything.
220# 1 1.2.3 -> 12.3
221# 2 1.2.3 -> 1.23
222# 1 1b-2.3 -> 1b2.3
223# Rather than being a number, $1 can be a separator character such as '-', '.'
224# or '_'. In this case, the first separator of this kind is deleted.
225delete_version_separator() {
226 replace_version_separator "${1}" "" "${2}"
227}
228
229# @FUNCTION: delete_all_version_separators
230# @USAGE: [subject]
231# @DESCRIPTION:
232# Delete all version separators in $1 (defaults to $PV).
233# 1b.2.3 -> 1b23
234delete_all_version_separators() {
235 replace_all_version_separators "" "${1}"
236}
237
238# @FUNCTION: get_version_component_count
239# @USAGE: [version]
240# @DESCRIPTION:
241# How many version components are there in $1 (defaults to $PV)?
242# 1.0.1 -> 3
243# 3.0c-r1 -> 4
244get_version_component_count() {
245 local a=($(get_version_components "${1:-${PV}}"))
246 echo ${#a[@]}
247}
248
249# @FUNCTION: get_last_version_component_index
250# @USAGE: [version]
251# @DESCRIPTION:
252# What is the index of the last version component in $1 (defaults to $PV)?
253# Equivalent to get_version_component_count - 1.
254# 1.0.1 -> 2
255# 3.0c-r1 -> 3
256get_last_version_component_index() {
257 echo $(($(get_version_component_count "${1:-${PV}}" ) - 1))
258}
259
260# @FUNCTION: version_is_at_least
261# @USAGE: <want> [have]
262# @DESCRIPTION:
183# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses 263# Is $2 (defaults to $PVR) at least version $1? Intended for use in eclasses
184# only. Not very reliable, doesn't understand most things, make sure you test 264# only. May not be reliable, be sure to do very careful testing before actually
185# reaaaallly well before using this. Prod ciaranm if you need it to support more 265# using this.
186# things... WARNING: DOES NOT HANDLE 1.2b style versions. WARNING: not very well
187# tested, needs lots of work before it's totally reliable. Use with extreme
188# caution.
189version_is_at_least() { 266version_is_at_least() {
190 local want_s="$1" have_s="${2:-${PVR}}" want_c have_c 267 local want_s="$1" have_s="${2:-${PVR}}" r
191 want_c=( $(get_version_components "$want_s" ) ) 268 version_compare "${want_s}" "${have_s}"
269 r=$?
270 case $r in
271 1|2)
272 return 0
273 ;;
274 3)
275 return 1
276 ;;
277 *)
278 die "versionator compare bug [atleast, ${want_s}, ${have_s}, ${r}]"
279 ;;
280 esac
281}
282
283# @FUNCTION: version_compare
284# @USAGE: <A> <B>
285# @DESCRIPTION:
286# Takes two parameters (A, B) which are versions. If A is an earlier version
287# than B, returns 1. If A is identical to B, return 2. If A is later than B,
288# return 3. You probably want version_is_at_least rather than this function.
289# May not be very reliable. Test carefully before using this.
290version_compare() {
291 eshopts_push -s extglob
292 local ver_a=${1} ver_b=${2} parts_a parts_b
293 local cur_tok_a cur_tok_b num_part_a num_part_b
294 local -i cur_idx_a=0 cur_idx_b=0 prev_idx_a prev_idx_b
192 have_c=( $(get_version_components "$have_s" ) ) 295 parts_a=( $(get_all_version_components "${ver_a}" ) )
296 parts_b=( $(get_all_version_components "${ver_b}" ) )
193 297
194 # Stage 1: compare the version numbers part. 298 ### compare number parts.
195 local done_w="" done_h="" i=0 299 local -i inf_loop=0
196 while [[ -z "${done_w}" ]] || [[ -z "${done_h}" ]] ; do 300 while true; do
197 local cur_w="${want_c[$i]}" cur_h="${have_c[$i]}" 301 inf_loop+=1
198 [[ -z "${cur_w##[^[:digit:]]*}" ]] && done_w="yes" 302 ((inf_loop > 20)) && \
199 [[ -z "${cur_h##[^[:digit:]]*}" ]] && done_h="yes" 303 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
200 [[ -z "${done_w}" ]] || cur_w=0 304
201 [[ -z "${done_h}" ]] || cur_h=0 305 # Store the current index to test later
202 if [[ ${cur_w} -lt ${cur_h} ]] ; then return 0 ; fi 306 prev_idx_a=cur_idx_a
203 if [[ ${cur_w} -gt ${cur_h} ]] ; then return 1 ; fi 307 prev_idx_b=cur_idx_b
204 i=$(($i + 1)) 308
309 # grab the current number components
310 cur_tok_a=${parts_a[cur_idx_a]}
311 cur_tok_b=${parts_b[cur_idx_b]}
312
313 # number?
314 if [[ -n ${cur_tok_a} ]] && [[ -z ${cur_tok_a//[[:digit:]]} ]] ; then
315 cur_idx_a+=1
316 [[ ${parts_a[cur_idx_a]} == . ]] \
317 && cur_idx_a+=1
318 else
319 cur_tok_a=
320 fi
321
322 if [[ -n ${cur_tok_b} ]] && [[ -z ${cur_tok_b//[[:digit:]]} ]] ; then
323 cur_idx_b+=1
324 [[ ${parts_b[cur_idx_b]} == . ]] \
325 && cur_idx_b+=1
326 else
327 cur_tok_b=
328 fi
329
330 # done with number components?
331 [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]] && break
332
333 # if a component is blank, then it is the lesser value
334 [[ -z ${cur_tok_a} ]] && eshopts_pop && return 1
335 [[ -z ${cur_tok_b} ]] && eshopts_pop && return 3
336
337 # According to PMS, if we are *not* in the first number part, and either
338 # token begins with "0", then we use a different algorithm (that
339 # effectively does floating point comparison)
340 if (( prev_idx_a != 0 && prev_idx_b != 0 )) \
341 && [[ ${cur_tok_a} == 0* || ${cur_tok_b} == 0* ]] ; then
342
343 # strip trailing zeros
344 cur_tok_a=${cur_tok_a%%+(0)}
345 cur_tok_b=${cur_tok_b%%+(0)}
346
347 # do a *string* comparison of the resulting values: 2 > 11
348 [[ ${cur_tok_a} < ${cur_tok_b} ]] && eshopts_pop && return 1
349 [[ ${cur_tok_a} > ${cur_tok_b} ]] && eshopts_pop && return 3
350 else
351 # to avoid going into octal mode, strip any leading zeros. otherwise
352 # bash will throw a hissy fit on versions like 6.3.068.
353 cur_tok_a=${cur_tok_a##+(0)}
354 cur_tok_b=${cur_tok_b##+(0)}
355
356 # now if a component is blank, it was originally 0 -- make it so
357 : ${cur_tok_a:=0}
358 : ${cur_tok_b:=0}
359
360 # compare
361 ((cur_tok_a < cur_tok_b)) && eshopts_pop && return 1
362 ((cur_tok_a > cur_tok_b)) && eshopts_pop && return 3
363 fi
364 done
365
366 ### number parts equal. compare letter parts.
367 local letter_a=
368 letter_a=${parts_a[cur_idx_a]}
369 if [[ ${#letter_a} -eq 1 && -z ${letter_a/[a-z]} ]] ; then
370 cur_idx_a+=1
371 else
372 letter_a=@
373 fi
374
375 local letter_b=
376 letter_b=${parts_b[cur_idx_b]}
377 if [[ ${#letter_b} -eq 1 && -z ${letter_b/[a-z]} ]] ; then
378 cur_idx_b+=1
379 else
380 letter_b=@
381 fi
382
383 # compare
384 [[ ${letter_a} < ${letter_b} ]] && eshopts_pop && return 1
385 [[ ${letter_a} > ${letter_b} ]] && eshopts_pop && return 3
386
387 ### letter parts equal. compare suffixes in order.
388 inf_loop=0
389 while true ; do
390 inf_loop+=1
391 ((inf_loop > 20)) && \
392 die "versionator compare bug [numbers, ${ver_a}, ${ver_b}]"
393 [[ ${parts_a[cur_idx_a]} == _ ]] && ((cur_idx_a++))
394 [[ ${parts_b[cur_idx_b]} == _ ]] && ((cur_idx_b++))
395
396 cur_tok_a=${parts_a[cur_idx_a]}
397 cur_tok_b=${parts_b[cur_idx_b]}
398 num_part_a=0
399 num_part_b=0
400
401 if has ${cur_tok_a%%+([0-9])} "alpha" "beta" "pre" "rc" "p"; then
402 cur_idx_a+=1
403 num_part_a=${cur_tok_a##+([a-z])}
404 # I don't like octal
405 num_part_a=${num_part_a##+(0)}
406 : ${num_part_a:=0}
407 cur_tok_a=${cur_tok_a%%+([0-9])}
408 else
409 cur_tok_a=
410 fi
411
412 if has ${cur_tok_b%%+([0-9])} alpha beta pre rc p; then
413 cur_idx_b+=1
414 num_part_b=${cur_tok_b##+([a-z])}
415 # I still don't like octal
416 num_part_b=${num_part_b##+(0)}
417 : ${num_part_b:=0}
418 cur_tok_b=${cur_tok_b%%+([0-9])}
419 else
420 cur_tok_b=
421 fi
422
423 if [[ ${cur_tok_a} != ${cur_tok_b} ]]; then
424 local suffix
425 for suffix in alpha beta pre rc "" p; do
426 [[ ${cur_tok_a} == ${suffix} ]] && eshopts_pop && return 1
427 [[ ${cur_tok_b} == ${suffix} ]] && eshopts_pop && return 3
205 done 428 done
206 429 elif [[ -z ${cur_tok_a} && -z ${cur_tok_b} ]]; then
207 local part
208 for part in "_alpha" "_beta" "_pre" "_rc" "_p" "-r" ; do
209 local part_w= part_h=
210
211 for (( i = 0 ; i < ${#want_c[@]} ; i = $i + 1 )) ; do
212 if [[ -z "${want_c[$i]##${part#[-._]}*}" ]] ; then
213 part_w="${want_c[$i]##${part#[-._]}}"
214 break 430 break
431 else
432 ((num_part_a < num_part_b)) && eshopts_pop && return 1
433 ((num_part_a > num_part_b)) && eshopts_pop && return 3
215 fi 434 fi
435 done
436
437 # At this point, the only thing that should be left is the -r# part
438 [[ ${parts_a[cur_idx_a]} == - ]] && ((cur_idx_a++))
439 [[ ${parts_b[cur_idx_b]} == - ]] && ((cur_idx_b++))
440
441 # Sanity check
442 if [[ ${parts_a[cur_idx_a]/r+([0-9])} || ${parts_b[cur_idx_b]/r+([0-9])} ]]; then
443 die "versionator compare bug [revisions, ${ver_a}, ${ver_b}]"
444 fi
445
446 num_part_a=${parts_a[cur_idx_a]#r}
447 num_part_a=${num_part_a##+(0)}
448 : ${num_part_a:=0}
449 num_part_b=${parts_b[cur_idx_b]#r}
450 num_part_b=${num_part_b##+(0)}
451 : ${num_part_b:=0}
452
453 ((num_part_a < num_part_b)) && eshopts_pop && return 1
454 ((num_part_a > num_part_b)) && eshopts_pop && return 3
455
456 ### no differences.
457 eshopts_pop
458 return 2
459}
460
461# @FUNCTION: version_sort
462# @USAGE: <version> [more versions...]
463# @DESCRIPTION:
464# Returns its parameters sorted, highest version last. We're using a quadratic
465# algorithm for simplicity, so don't call it with more than a few dozen items.
466# Uses version_compare, so be careful.
467version_sort() {
468 eshopts_push -s extglob
469 local items=
470 local -i left=0
471 items=("$@")
472 while ((left < ${#items[@]})); do
473 local -i lowest_idx=left
474 local -i idx=lowest_idx+1
475 while ((idx < ${#items[@]})); do
476 version_compare "${items[lowest_idx]}" "${items[idx]}"
477 [[ $? -eq 3 ]] && lowest_idx=idx
478 idx+=1
216 done 479 done
217 for (( i = 0 ; i < ${#have_c[@]} ; i = $i + 1 )) ; do 480 local tmp=${items[lowest_idx]}
218 if [[ -z "${have_c[$i]##${part#[-._]}*}" ]] ; then 481 items[lowest_idx]=${items[left]}
219 part_h="${have_c[$i]##${part#[-._]}}" 482 items[left]=${tmp}
220 break 483 left+=1
221 fi 484 done
485 echo ${items[@]}
486 eshopts_pop
487}
488
489# @FUNCTION: version_format_string
490# @USAGE: <format> [version]
491# @DESCRIPTION:
492# Reformat complicated version strings. The first argument is the string
493# to reformat with while the rest of the args are passed on to the
494# get_version_components function. You should make sure to single quote
495# the first argument since it'll have variables that get delayed expansions.
496# @EXAMPLE:
497# P="cow-hat-1.2.3_p4"
498# MY_P=$(version_format_string '${PN}_source_$1_$2-$3_$4')
499# Now MY_P will be: cow-hat_source_1_2-3_p4
500version_format_string() {
501 local fstr=$1
502 shift
503 set -- $(get_version_components "$@")
504 eval echo "${fstr}"
505}
506
507__versionator__test_version_compare() {
508 eshopts_push -s extglob
509 local lt=1 eq=2 gt=3 p q
510
511 __versionator__test_version_compare_t() {
512 version_compare "${1}" "${3}"
513 local r=$?
514 [[ ${r} -eq ${2} ]] || echo "FAIL: ${@} (got ${r} exp ${2})"
515 }
516
517 echo "
518 0 $lt 1
519 1 $lt 2
520 2 $gt 1
521 2 $eq 2
522 0 $eq 0
523 10 $lt 20
524 68 $eq 068
525 068 $gt 67
526 068 $lt 69
527
528 1.0 $lt 2.0
529 2.0 $eq 2.0
530 2.0 $gt 1.0
531
532 1.0 $gt 0.0
533 0.0 $eq 0.0
534 0.0 $lt 1.0
535
536 0.1 $lt 0.2
537 0.2 $eq 0.2
538 0.3 $gt 0.2
539
540 1.2 $lt 2.1
541 2.1 $gt 1.2
542
543 1.2.3 $lt 1.2.4
544 1.2.4 $gt 1.2.3
545
546 1.2.0 $gt 1.2
547 1.2.1 $gt 1.2
548 1.2 $lt 1.2.1
549
550 1.2b $eq 1.2b
551 1.2b $lt 1.2c
552 1.2b $gt 1.2a
553 1.2b $gt 1.2
554 1.2 $lt 1.2a
555
556 1.3 $gt 1.2a
557 1.3 $lt 1.3a
558
559 1.0_alpha7 $lt 1.0_beta7
560 1.0_beta $lt 1.0_pre
561 1.0_pre5 $lt 1.0_rc2
562 1.0_rc2 $lt 1.0
563
564 1.0_p1 $gt 1.0
565 1.0_p1-r1 $gt 1.0_p1
566
567 1.0_alpha6-r1 $gt 1.0_alpha6
568 1.0_beta6-r1 $gt 1.0_alpha6-r2
569
570 1.0_pre1 $lt 1.0_p1
571
572 1.0p $gt 1.0_p1
573 1.0r $gt 1.0-r1
574 1.6.15 $gt 1.6.10-r2
575 1.6.10-r2 $lt 1.6.15
576
577 " | while read a b c ; do
578 [[ -z "${a}${b}${c}" ]] && continue;
579 __versionator__test_version_compare_t "${a}" "${b}" "${c}"
580 done
581
582
583 for q in "alpha beta pre rc=${lt};${gt}" "p=${gt};${lt}" ; do
584 for p in ${q%%=*} ; do
585 local c=${q##*=}
586 local alt=${c%%;*} agt=${c##*;}
587 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}"
588 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}1"
589 __versionator__test_version_compare_t "1.0" $agt "1.0_${p}068"
590
591 __versionator__test_version_compare_t "2.0_${p}" $alt "2.0"
592 __versionator__test_version_compare_t "2.0_${p}1" $alt "2.0"
593 __versionator__test_version_compare_t "2.0_${p}068" $alt "2.0"
594
595 __versionator__test_version_compare_t "1.0_${p}" $eq "1.0_${p}"
596 __versionator__test_version_compare_t "0.0_${p}" $lt "0.0_${p}1"
597 __versionator__test_version_compare_t "666_${p}3" $gt "666_${p}"
598
599 __versionator__test_version_compare_t "1_${p}7" $lt "1_${p}8"
600 __versionator__test_version_compare_t "1_${p}7" $eq "1_${p}7"
601 __versionator__test_version_compare_t "1_${p}7" $gt "1_${p}6"
602 __versionator__test_version_compare_t "1_${p}09" $eq "1_${p}9"
603
604 __versionator__test_version_compare_t "1_${p}7-r0" $eq "1_${p}7"
605 __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r1"
606 __versionator__test_version_compare_t "1_${p}7-r0" $lt "1_${p}7-r01"
607 __versionator__test_version_compare_t "1_${p}7-r01" $eq "1_${p}7-r1"
608 __versionator__test_version_compare_t "1_${p}8-r1" $gt "1_${p}7-r100"
609
610 __versionator__test_version_compare_t "1_${p}_alpha" $lt "1_${p}_beta"
222 done 611 done
223
224 if [[ "${part}" == "_p" ]] || [[ "${part}" == "-r" ]] ; then
225 # if present in neither want nor have, go to the next item
226 [[ -z "${part_w}" ]] && [[ -z "${part_h}" ]] && continue
227
228 [[ -z "${part_w}" ]] && [[ -n "${part_h}" ]] && return 0
229 [[ -n "${part_w}" ]] && [[ -z "${part_h}" ]] && return 1
230
231 if [[ ${part_w} -lt ${part_h} ]] ; then return 0 ; fi
232 if [[ ${part_w} -gt ${part_h} ]] ; then return 1 ; fi
233
234 else
235 # if present in neither want nor have, go to the next item
236 [[ -z "${part_w}" ]] && [[ -z "${part_h}" ]] && continue
237
238 [[ -z "${part_w}" ]] && [[ -n "${part_h}" ]] && return 1
239 [[ -n "${part_w}" ]] && [[ -z "${part_h}" ]] && return 0
240
241 if [[ ${part_w} -lt ${part_h} ]] ; then return 0 ; fi
242 if [[ ${part_w} -gt ${part_h} ]] ; then return 1 ; fi
243 fi
244 done 612 done
245 613
246 return 0 614 for p in "-r" "_p" ; do
247} 615 __versionator__test_version_compare_t "7.2${p}1" $lt "7.2${p}2"
616 __versionator__test_version_compare_t "7.2${p}2" $gt "7.2${p}1"
617 __versionator__test_version_compare_t "7.2${p}3" $gt "7.2${p}2"
618 __versionator__test_version_compare_t "7.2${p}2" $lt "7.2${p}3"
619 done
248 620
249# Test function thing. To use, source versionator.eclass and then run it. 621 # The following tests all come from portage's test cases:
250__versionator__test_version_is_at_least() { 622 __versionator__test_version_compare_t "6.0" $gt "5.0"
251 version_is_at_least "1.2" "1.2" || echo "test 1 failed" 623 __versionator__test_version_compare_t "5.0" $gt "5"
252 version_is_at_least "1.2" "1.2.3" || echo "test 2 failed" 624 __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
253 version_is_at_least "1.2.3" "1.2" && echo "test 3 failed" 625 __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
626 __versionator__test_version_compare_t "999999999999999999999999999999" $gt "999999999999999999999999999998"
627 __versionator__test_version_compare_t "1.0.0" $gt "1.0"
628 __versionator__test_version_compare_t "1.0.0" $gt "1.0b"
629 __versionator__test_version_compare_t "1b" $gt "1"
630 __versionator__test_version_compare_t "1b_p1" $gt "1_p1"
631 __versionator__test_version_compare_t "1.1b" $gt "1.1"
632 __versionator__test_version_compare_t "12.2.5" $gt "12.2b"
254 633
255 version_is_at_least "1.2_beta1" "1.2" || echo "test 4 failed" 634 __versionator__test_version_compare_t "4.0" $lt "5.0"
256 version_is_at_least "1.2_alpha1" "1.2" || echo "test 5 failed" 635 __versionator__test_version_compare_t "5" $lt "5.0"
257 version_is_at_least "1.2_alpha1" "1.2_beta1" || echo "test 6 failed" 636 __versionator__test_version_compare_t "1.0_pre2" $lt "1.0_p2"
637 __versionator__test_version_compare_t "1.0_alpha2" $lt "1.0_p2"
638 __versionator__test_version_compare_t "1.0_alpha1" $lt "1.0_beta1"
639 __versionator__test_version_compare_t "1.0_beta3" $lt "1.0_rc3"
640 __versionator__test_version_compare_t "1.001000000000000000001" $lt "1.001000000000000000002"
641 __versionator__test_version_compare_t "1.00100000000" $lt "1.0010000000000000001"
642 __versionator__test_version_compare_t "999999999999999999999999999998" $lt "999999999999999999999999999999"
643 __versionator__test_version_compare_t "1.01" $lt "1.1"
644 __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
645 __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
646 __versionator__test_version_compare_t "1.0" $lt "1.0.0"
647 __versionator__test_version_compare_t "1.0b" $lt "1.0.0"
648 __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
649 __versionator__test_version_compare_t "1" $lt "1b"
650 __versionator__test_version_compare_t "1.1" $lt "1.1b"
651 __versionator__test_version_compare_t "12.2b" $lt "12.2.5"
258 652
259 version_is_at_least "1.2" "1.2_beta1" && echo "test 7 failed" 653 __versionator__test_version_compare_t "4.0" $eq "4.0"
260 version_is_at_least "1.2" "1.2_alpha1" && echo "test 8 failed" 654 __versionator__test_version_compare_t "1.0" $eq "1.0"
261 version_is_at_least "1.2_beta1" "1.2_alpha1" && echo "test 9 failed" 655 __versionator__test_version_compare_t "1.0-r0" $eq "1.0"
656 __versionator__test_version_compare_t "1.0" $eq "1.0-r0"
657 __versionator__test_version_compare_t "1.0-r0" $eq "1.0-r0"
658 __versionator__test_version_compare_t "1.0-r1" $eq "1.0-r1"
262 659
263 version_is_at_least "1.2_beta1" "1.2_beta1" || echo "test 10 failed" 660 # The following were just tests for != in portage, we need something a bit
264 version_is_at_least "1.2_beta2" "1.2_beta1" && echo "test 11 failed" 661 # more precise
265 version_is_at_least "1.2_beta2" "1.2_beta3" || echo "test 12 failed" 662 __versionator__test_version_compare_t "1" $lt "2"
663 __versionator__test_version_compare_t "1.0_alpha" $lt "1.0_pre"
664 __versionator__test_version_compare_t "1.0_beta" $gt "1.0_alpha"
665 __versionator__test_version_compare_t "0" $lt "0.0"
666 __versionator__test_version_compare_t "1.0-r0" $lt "1.0-r1"
667 __versionator__test_version_compare_t "1.0-r1" $gt "1.0-r0"
668 __versionator__test_version_compare_t "1.0" $lt "1.0-r1"
669 __versionator__test_version_compare_t "1.0-r1" $gt "1.0"
670 __versionator__test_version_compare_t "1_p1" $lt "1b_p1"
671 __versionator__test_version_compare_t "1b" $gt "1"
672 __versionator__test_version_compare_t "1.1b" $gt "1.1"
673 __versionator__test_version_compare_t "12.2b" $gt "12.2"
266 674
267 version_is_at_least "1.2-r1" "1.2" && echo "test 13 failed" 675 # The following tests all come from paludis's test cases:
268 version_is_at_least "1.2" "1.2-r1" || echo "test 14 failed" 676 __versionator__test_version_compare_t "1.0" $gt "1"
269 version_is_at_least "1.2-r1" "1.3" || echo "test 15 failed" 677 __versionator__test_version_compare_t "1" $lt "1.0"
270 version_is_at_least "1.2-r1" "1.2-r2" || echo "test 16 failed" 678 __versionator__test_version_compare_t "1.0_alpha" $gt "1_alpha"
271 version_is_at_least "1.2-r3" "1.2-r2" && echo "test 17 failed" 679 __versionator__test_version_compare_t "1.0_alpha" $gt "1"
680 __versionator__test_version_compare_t "1.0_alpha" $lt "1.0"
681 __versionator__test_version_compare_t "1.2.0.0_alpha7-r4" $gt "1.2_alpha7-r4"
272 682
273 version_is_at_least "1.2-r1" "1.2_beta2-r3" && echo "test 18 failed" 683 __versionator__test_version_compare_t "0001" $eq "1"
274 version_is_at_least "1.2-r1" "1.3_beta2-r3" || echo "test 19 failed" 684 __versionator__test_version_compare_t "01" $eq "001"
275 return 0 685 __versionator__test_version_compare_t "0001.1" $eq "1.1"
276} 686 __versionator__test_version_compare_t "01.01" $eq "1.01"
687 __versionator__test_version_compare_t "1.010" $eq "1.01"
688 __versionator__test_version_compare_t "1.00" $eq "1.0"
689 __versionator__test_version_compare_t "1.0100" $eq "1.010"
690 __versionator__test_version_compare_t "1" $eq "1-r0"
691 __versionator__test_version_compare_t "1-r00" $eq "1-r0"
277 692
693 eshopts_pop
694}

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20