IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-03 04:01:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added the ability to do Beta versioning

Browse Source 
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:
Lynn Root 2012-11-05 03:58:45 -05:00 committed by Martin Kosek
parent 4eefb06a84
commit 9ee8e11164
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -24,11 +24,15 @@ ifndef IPA_VERSION
ifdef IPA_VERSION_PRE_RELEASE ifdef IPA_VERSION_PRE_RELEASE
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).pre$(IPA_VERSION_PRE_RELEASE) IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).pre$(IPA_VERSION_PRE_RELEASE)
else 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 ifdef IPA_VERSION_RC_RELEASE
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).rc$(IPA_VERSION_RC_RELEASE) IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).rc$(IPA_VERSION_RC_RELEASE)
else else
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE) IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE)
endif # rc endif # rc
endif # beta
endif # pre endif # pre
endif # ipa_version endif # ipa_version

12
VERSION
View File

@ -3,7 +3,7 @@
# # # #
# freeIPA versions are as follows # # freeIPA versions are as follows #
# 1.0.x New production series # # 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 # # 1.0.0GITabcdefg Build from GIT #
# # # #
######################################################## ########################################################
@ -32,6 +32,16 @@ IPA_VERSION_RELEASE=0
######################################################## ########################################################
IPA_VERSION_PRE_RELEASE= 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 # # For 'rc' releases the version will be #
# # # #