diff options
author | Lynn Root <lroot@redhat.com> | 2012-11-05 03:58:45 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-12-11 11:02:11 +0100 |
commit | 9ee8e11164d4456345c69ffe6c5a44829e8cba45 (patch) | |
tree | 750f56c6fb64fc3ce24f065c8d362e7c78817542 | |
parent | 4eefb06a84779141f2d56fd06ce9cd7dd4b74cea (diff) | |
download | freeipa-9ee8e11164d4456345c69ffe6c5a44829e8cba45.tar.gz freeipa-9ee8e11164d4456345c69ffe6c5a44829e8cba45.tar.xz freeipa-9ee8e11164d4456345c69ffe6c5a44829e8cba45.zip |
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
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | VERSION | 12 |
2 files changed, 15 insertions, 1 deletions
@@ -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 @@ -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 # # # ######################################################## @@ -33,6 +33,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 # # # # <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE> # |