summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--VERSION12
2 files changed, 15 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 32a46cacb..63672b23a 100644
--- a/Makefile
+++ b/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
diff --git a/VERSION b/VERSION
index 3936f394f..e45dd508e 100644
--- a/VERSION
+++ b/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> #