Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 12/11/2012 10:47 AM, Lynn Root wrote: > On 12/11/2012 10:37 AM, Martin Kosek wrote: >> On 11/09/2012 01:43 PM, Lynn Root wrote: >>> 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 >> The patch works fine. I have just one nitpick - comment in VERSION file is >> not >> right, mentions a wrong variable: >> >> +# e.g. IPA_VERSION_BETA=1 # << >> +# -> "1.0.0beta1"# >> + >> +IPA_VERSION_BETA_RELEASE= >> + >> >> Martin > Updated patch attached, thank you for the catch! > ACK. Pushed to master. Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 12/11/2012 10:37 AM, Martin Kosek wrote:
On 11/09/2012 01:43 PM, Lynn Root wrote:
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
The patch works fine. I have just one nitpick - comment in VERSION file is not
right, mentions a wrong variable:
+# e.g. IPA_VERSION_BETA=1 # <<
+# -> "1.0.0beta1"#
+
+IPA_VERSION_BETA_RELEASE=
+
Martin
Updated patch attached, thank you for the catch!
--
Lynn Root
@roguelynn
Associate Software Engineer
Red Hat, Inc
>From 7ad67ea1c2604446bef55538f38cf6f228bcdf25 Mon Sep 17 00:00:00 2001
From: Lynn Root
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 32a46cacb24605b23957d8471e577aadcbfe32f1..63672b23a92fa6d6017083b438f170e7add2918d 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 6e2696047dd0636ef3343b955e8cb7ae5b4acd0a..f263f1e40de58b25d489cbd92486b62e41985b09 100644
--- a/VERSION
+++ b/VERSION
@@ -3,7 +3,7 @@
# #
# freeIPA versions are as follows #
# 1.0.xNew 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 #
+# #
+# ..beta #
+# #
+# e.g. IPA_VERSION_BETA_RELEASE=1 #
+# -> "1.0.0beta1"#
+
+IPA_VERSION_BETA_RELEASE=
+
+
# For 'rc' releases the version will be#
# #
# ..rc #
--
1.8.0.1
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 11/09/2012 01:43 PM, Lynn Root wrote: > 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 The patch works fine. I have just one nitpick - comment in VERSION file is not right, mentions a wrong variable: +# e.g. IPA_VERSION_BETA=1 # << +# -> "1.0.0beta1"# + +IPA_VERSION_BETA_RELEASE= + Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 11/10/2012 12:08 AM, Dmitri Pal wrote: > On 11/09/2012 05:52 PM, Simo Sorce wrote: >> On Fri, 2012-11-09 at 15:59 -0500, Dmitri Pal wrote: >>> On 11/09/2012 07:58 AM, Petr Vobornik wrote: On 11/09/2012 01:43 PM, Lynn Root wrote: > 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 Thanks for the patch. In a next patch, I'd suggest to follow patch-naming conventions https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the patch number into a mail subject, it helps to keeping track of patches. >>> OK, finally. It is a good time to ask. >>> >>> Several years ago when we adopted this format I was wondering what is >>> the exact sequence of operations one should do to make the resulting >>> patch follow the format. >>> I never figured it out so I never adopted the format for the patches I >>> provide for ding-libs from time to time. >>> >>> So in the title of the commit message I put (for example): >>> [INI] Remove code that allows dup sections >>> >>> the I do git format-patch with arguments >>> this translates into a patch with name >>> 0001-INI-Remove-code-that-allows-dup-sections.patch >>> >>> So am I supposed to the manually rename the patch to follow the format >>> or have a script to do that or there is some other way that I do not >>> know about that would allow me to provide patches following the format >>> above right out of the git format-patch so that I do not need to do the >>> renaming? >> This patch format rule is followed only on freeipa-devel for Freeipa >> patches. >> >> Some people have developed scripts to do the renaming automatically. >> >> ding libs stuff is tracked on sssd-devel which does not use this patch >> format rule, we enver felt it necessary in sssd development. >> >> Simo. >> > I understand. It was more a conceptual question. It looks like the > answer "there are scripts to do renaming that each developer has". > Thanks. This is all I was looking for. > Right. I understand that it may be difficult to follow the patch naming rule for new people in the project. But I personally like both numbering and naming conventions as it helps me with locating patches when reviewing and with referencing patch numbers in IRC conversations. The script is the most straightforward approach to choose For example when I am submitting a patch, all I need to do is to run a script which will extract the patch from git, name and number it correctly and opens me a Compose Email window in my MUA with patch already attached and description taken from the patch description. It can even upload the patch to Trac Ticket and switch "patch sent for review" to 1. If people are interested in the script, I can upload it to some github repo and we can link it then from our freeipa.org Contribute page. Martin ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 11/09/2012 05:52 PM, Simo Sorce wrote: > On Fri, 2012-11-09 at 15:59 -0500, Dmitri Pal wrote: >> On 11/09/2012 07:58 AM, Petr Vobornik wrote: >>> On 11/09/2012 01:43 PM, Lynn Root wrote: 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 >>> Thanks for the patch. >>> >>> In a next patch, I'd suggest to follow patch-naming conventions >>> https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the >>> patch number into a mail subject, it helps to keeping track of patches. >>> >> OK, finally. It is a good time to ask. >> >> Several years ago when we adopted this format I was wondering what is >> the exact sequence of operations one should do to make the resulting >> patch follow the format. >> I never figured it out so I never adopted the format for the patches I >> provide for ding-libs from time to time. >> >> So in the title of the commit message I put (for example): >> [INI] Remove code that allows dup sections >> >> the I do git format-patch with arguments >> this translates into a patch with name >> 0001-INI-Remove-code-that-allows-dup-sections.patch >> >> So am I supposed to the manually rename the patch to follow the format >> or have a script to do that or there is some other way that I do not >> know about that would allow me to provide patches following the format >> above right out of the git format-patch so that I do not need to do the >> renaming? > This patch format rule is followed only on freeipa-devel for Freeipa > patches. > > Some people have developed scripts to do the renaming automatically. > > ding libs stuff is tracked on sssd-devel which does not use this patch > format rule, we enver felt it necessary in sssd development. > > Simo. > I understand. It was more a conceptual question. It looks like the answer "there are scripts to do renaming that each developer has". Thanks. This is all I was looking for. -- Thank you, Dmitri Pal Sr. Engineering Manager for IdM portfolio Red Hat Inc. --- Looking to carve out IT costs? www.redhat.com/carveoutcosts/ ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On Fri, 2012-11-09 at 15:59 -0500, Dmitri Pal wrote: > On 11/09/2012 07:58 AM, Petr Vobornik wrote: > > On 11/09/2012 01:43 PM, Lynn Root wrote: > >> 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 > > > > Thanks for the patch. > > > > In a next patch, I'd suggest to follow patch-naming conventions > > https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the > > patch number into a mail subject, it helps to keeping track of patches. > > > OK, finally. It is a good time to ask. > > Several years ago when we adopted this format I was wondering what is > the exact sequence of operations one should do to make the resulting > patch follow the format. > I never figured it out so I never adopted the format for the patches I > provide for ding-libs from time to time. > > So in the title of the commit message I put (for example): > [INI] Remove code that allows dup sections > > the I do git format-patch with arguments > this translates into a patch with name > 0001-INI-Remove-code-that-allows-dup-sections.patch > > So am I supposed to the manually rename the patch to follow the format > or have a script to do that or there is some other way that I do not > know about that would allow me to provide patches following the format > above right out of the git format-patch so that I do not need to do the > renaming? This patch format rule is followed only on freeipa-devel for Freeipa patches. Some people have developed scripts to do the renaming automatically. ding libs stuff is tracked on sssd-devel which does not use this patch format rule, we enver felt it necessary in sssd development. Simo. -- Simo Sorce * Red Hat, Inc * New York ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 11/09/2012 07:58 AM, Petr Vobornik wrote: > On 11/09/2012 01:43 PM, Lynn Root wrote: >> 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 > > Thanks for the patch. > > In a next patch, I'd suggest to follow patch-naming conventions > https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the > patch number into a mail subject, it helps to keeping track of patches. > OK, finally. It is a good time to ask. Several years ago when we adopted this format I was wondering what is the exact sequence of operations one should do to make the resulting patch follow the format. I never figured it out so I never adopted the format for the patches I provide for ding-libs from time to time. So in the title of the commit message I put (for example): [INI] Remove code that allows dup sections the I do git format-patch with arguments this translates into a patch with name 0001-INI-Remove-code-that-allows-dup-sections.patch So am I supposed to the manually rename the patch to follow the format or have a script to do that or there is some other way that I do not know about that would allow me to provide patches following the format above right out of the git format-patch so that I do not need to do the renaming? Please advise. -- Thank you, Dmitri Pal Sr. Engineering Manager for IdM portfolio Red Hat Inc. --- Looking to carve out IT costs? www.redhat.com/carveoutcosts/ ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
Actually, there is a link in the Contribute wiki page for the Patch format page: ... Patch Format - Guidance about the patch format ... We may want to make it more visible... Martin On 11/09/2012 02:04 PM, Lynn Root wrote: > Ah thank you - was going by the "Submit Changes" portion in > http://freeipa.org/page/Contribute#Development_Process, which has less > information (but clearly did not notice the Patch Format link right above). > > Lynn Root > Associate Software Engineer > Red Hat > > - Original Message - > From: "Petr Vobornik" > To: "Lynn Root" > Cc: freeipa-devel@redhat.com > Sent: Friday, November 9, 2012 1:58:17 PM > Subject: Re: [Freeipa-devel] [PATCH] Add Beta versioning > > On 11/09/2012 01:43 PM, Lynn Root wrote: >> 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 > > Thanks for the patch. > > In a next patch, I'd suggest to follow patch-naming conventions > https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the > patch number into a mail subject, it helps to keeping track of patches. > ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
Ah thank you - was going by the "Submit Changes" portion in http://freeipa.org/page/Contribute#Development_Process, which has less information (but clearly did not notice the Patch Format link right above). Lynn Root Associate Software Engineer Red Hat - Original Message - From: "Petr Vobornik" To: "Lynn Root" Cc: freeipa-devel@redhat.com Sent: Friday, November 9, 2012 1:58:17 PM Subject: Re: [Freeipa-devel] [PATCH] Add Beta versioning On 11/09/2012 01:43 PM, Lynn Root wrote: > 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 Thanks for the patch. In a next patch, I'd suggest to follow patch-naming conventions https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the patch number into a mail subject, it helps to keeping track of patches. -- Petr Vobornik ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] Add Beta versioning
On 11/09/2012 01:43 PM, Lynn Root wrote: 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 Thanks for the patch. In a next patch, I'd suggest to follow patch-naming conventions https://fedorahosted.org/freeipa/wiki/PatchFormat . Also include the patch number into a mail subject, it helps to keeping track of patches. -- Petr Vobornik ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
[Freeipa-devel] [PATCH] Add Beta versioning
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
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.xNew 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 #
+# #
+# ..beta #
+# #
+# e.g. IPA_VERSION_BETA=1 #
+# -> "1.0.0beta1"#
+
+IPA_VERSION_BETA_RELEASE=
+
+
# For 'rc' releases the version will be#
# #
# ..rc #
--
1.7.12
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
