mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-01-24 07:06:37 -06:00
Added the ability to do Beta versioning
The VERSION file and Makefile now handles beta versioning when given an argument. Ticket: https://fedorahosted.org/freeipa/ticket/2893
This commit is contained in:
parent
4eefb06a84
commit
9ee8e11164
4
Makefile
4
Makefile
@ -24,11 +24,15 @@ ifndef IPA_VERSION
|
||||
ifdef IPA_VERSION_PRE_RELEASE
|
||||
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).pre$(IPA_VERSION_PRE_RELEASE)
|
||||
else
|
||||
ifdef IPA_VERSION_BETA_RELEASE
|
||||
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).beta$(IPA_VERSION_BETA_RELEASE)
|
||||
else
|
||||
ifdef IPA_VERSION_RC_RELEASE
|
||||
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).rc$(IPA_VERSION_RC_RELEASE)
|
||||
else
|
||||
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE)
|
||||
endif # rc
|
||||
endif # beta
|
||||
endif # pre
|
||||
endif # ipa_version
|
||||
|
||||
|
12
VERSION
12
VERSION
@ -3,7 +3,7 @@
|
||||
# #
|
||||
# freeIPA versions are as follows #
|
||||
# 1.0.x New production series #
|
||||
# 1.0.x{pre,rc}y Preview/Testing & RC #
|
||||
# 1.0.x{pre,beta,rc}y Preview/Testing, Beta & RC #
|
||||
# 1.0.0GITabcdefg Build from GIT #
|
||||
# #
|
||||
########################################################
|
||||
@ -32,6 +32,16 @@ IPA_VERSION_RELEASE=0
|
||||
########################################################
|
||||
IPA_VERSION_PRE_RELEASE=
|
||||
|
||||
########################################################
|
||||
# For 'beta' releases the version will be #
|
||||
# #
|
||||
# <MAJOR>.<MINOR>.<RELEASE>beta<BETA_RELEASE> #
|
||||
# #
|
||||
# e.g. IPA_VERSION_BETA_RELEASE=1 #
|
||||
# -> "1.0.0beta1" #
|
||||
########################################################
|
||||
IPA_VERSION_BETA_RELEASE=
|
||||
|
||||
########################################################
|
||||
# For 'rc' releases the version will be #
|
||||
# #
|
||||
|
Loading…
Reference in New Issue
Block a user