The VERSION file and Makefile now handles 'beta' release parameters when making 
s/rpms.

Ticket: https://fedorahosted.org/freeipa/ticket/2893

Lynn Root
Associate Software Engineer
Red Hat

From 967856ba1a7b24488ea0c11197dbeeda3e4ba39a Mon Sep 17 00:00:00 2001
From: Lynn Root <lr...@redhat.com>
Date: Mon, 5 Nov 2012 03:58:45 -0500
Subject: [PATCH] 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
---
 Makefile |  4 ++++
 VERSION  | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 32a46ca..63672b2 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 6e26960..245781d 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=99
 IPA_VERSION_PRE_RELEASE=
 
 ########################################################
+# For 'beta' releases the version will be              #
+#                                                      #
+# <MAJOR>.<MINOR>.<RELEASE>beta<BETA_RELEASE>          #
+#                                                      #
+# e.g. IPA_VERSION_BETA=1                              #
+#  ->  "1.0.0beta1"                                    #
+########################################################
+IPA_VERSION_BETA_RELEASE=
+
+########################################################
 # For 'rc' releases the version will be                #
 #                                                      #
 # <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE>              #
-- 
1.7.12

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to