modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implémenter setprelease et setmetadata

This commit is contained in:
Jephte CLAIN 2014-01-18 20:59:52 +04:00
parent e10b3f09f3
commit 287c4a7bac
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ulib/semver
View File

@ -112,12 +112,13 @@ function semver_setversion() {
} }
function semver_setprelease() { function semver_setprelease() {
# XXX analyser $1 et spliter avant de copier dans le tableau $5 if [ -n "$1" ]; then
if [ "$1" ]; then __semver_check_prelease "$1" || return 1
set_array "$5" @ "$1" array_split "$5" "$1" .
else else
array_new "$5" array_new "$5"
fi fi
return 0
} }
function semver_compare_prelease() { function semver_compare_prelease() {
@ -125,12 +126,13 @@ function semver_compare_prelease() {
} }
function semver_setmetadata() { function semver_setmetadata() {
# XXX analyser $1 et spliter avant de copier dans le tableau $6 if [ -n "$1" ]; then
if [ "$1" ]; then __semver_check_metadata "$1" || return 1
set_array "$6" @ "$1" array_split "$6" "$1" .
else else
array_new "$5" array_new "$5"
fi fi
return 0
} }
function semver_compare_metadata() { function semver_compare_metadata() {

13
uversion
View File

@ -56,7 +56,7 @@ OPTIONS
Augmenter le numéro de patch Augmenter le numéro de patch
-l, --prelease ID -l, --prelease ID
Spécifier un identifiant de prérelease, à ajouter au numéro de version. Spécifier un identifiant de pré-release, à ajouter au numéro de version.
-a, --alpha -a, --alpha
-b, --beta -b, --beta
-r, --rc -r, --rc
@ -244,7 +244,9 @@ elif [ "$action" == update ]; then
fi fi
# forcer le numéro de version # forcer le numéro de version
psemver_setversion "$setversion" "" || die "Numéro de version invalide: $setversion" if [ -n "$setversion" ]; then
psemver_setversion "$setversion" "" || die "Numéro de version invalide: $setversion"
fi
# incrémenter les numéros de version # incrémenter les numéros de version
if [ "$incversion" == auto ]; then if [ "$incversion" == auto ]; then
@ -286,7 +288,7 @@ elif [ "$action" == update ]; then
if [ -n "$setrelease" ]; then if [ -n "$setrelease" ]; then
psemver_setprelease "" psemver_setprelease ""
elif [ -n "$setprelease" ]; then elif [ -n "$setprelease" ]; then
psemver_setprelease "$setprelease" psemver_setprelease "$setprelease" || die "Identifiant de pre-release invalide: $setprelease"
fi fi
if [ -n "$setalpha" ]; then if [ -n "$setalpha" ]; then
: :
@ -297,8 +299,11 @@ elif [ "$action" == update ]; then
fi fi
# spécifier metadata # spécifier metadata
[ -n "$setmetadata" ] && psemver_setmetadata "$setmetadata" if [ -n "$setmetadata" ]; then
psemver_setmetadata "$setmetadata" || die "Identifiant de build invalide: $setmetadata"
fi
# afficher le résultat final
psemver_setvar version psemver_setvar version
if [ -n "$file" ]; then if [ -n "$file" ]; then
echo "$version" >"$file" echo "$version" >"$file"