[PATCH 0/3] A few fixes in the libdrm release documentation

[PATCH 0/3] A few fixes in the libdrm release documentation

[Damien Lespiau]

Made a release with those instructions, they turned out to be slightly
outdated. Fix it for the next first-time person.

-- 
Damien

Damien Lespiau (3):
  RELEASING: Fix releasing instructions to match the latest release.sh
  RELEASING: Fix the step numbering
  RELEASING: Fix annouce typo

 RELEASING | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

-- 
1.8.3.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 1/3] RELEASING: Fix releasing instructions to match the latest release.sh

[Damien Lespiau]

It seems that the tests don't need DRM master anymore? at least make
distcheck passes when X is running.

release.sh is also invoked with just the path to the libdrm git checkout
and we don't want to pass additional arguments that will be treated as
additional modules we want to release.

Also, make a note that release.sh will run make distcheck for you, so we
don't strickly need to run it beforehand.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 RELEASING | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/RELEASING b/RELEASING
index 3f07146..e17dbea 100644
--- a/RELEASING
+++ b/RELEASING
@@ -20,13 +20,12 @@ Follow these steps to release a new version of libdrm:
   4) Run autoconf and then re-run ./configure so the build system
      picks up the new version number.
 
-  5) Verify that the code passes "make distcheck".  libdrm is tricky
-     to distcheck since the test suite will need to become drm master.
-     This means that you need to run it outside X, that is, in text
-     mode (KMS or no KMS doesn't matter).
+  5) (optional step, release.sh will make distcheck for you, but it can be
+      heart warming to verify that make distcheck passes)
 
-     Running "make distcheck" should result in no warnings or errors
-     and end with a message of the form:
+     Verify that the code passes "make distcheck".  Running "make
+     distcheck" should result in no warnings or errors and end with a
+     message of the form:
 
 	=============================================
 	libdrm-X.Y.Z archives ready for distribution:
@@ -52,11 +51,11 @@ Follow these steps to release a new version of libdrm:
 
   6) Use the release.sh script from the xorg/util/modular repo to
      upload the tarballs to the freedesktop.org download area and
-     create an annouce email template.  The script takes three
-     arguments: a "section", the previous tag and the new tag we just
-     created.  For 2.4.16 again, the command is:
+     create an annouce email template.  The script takes one argument:
+     the path to the libdrm checkout. So, if a checkout of modular is
+     at the same level than the libdrm repo:
 
-	../modular/release.sh libdrm 2.4.15 2.4.16
+	./modular/release.sh libdrm
 
      This copies the two tarballs to freedesktop.org and creates
      libdrm-2.4.16.announce which has a detailed summary of the
-- 
1.8.3.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/3] RELEASING: Fix the step numbering

[Damien Lespiau]

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 RELEASING | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/RELEASING b/RELEASING
index e17dbea..8ed7490 100644
--- a/RELEASING
+++ b/RELEASING
@@ -13,14 +13,14 @@ Follow these steps to release a new version of libdrm:
      modifications. You're probably in a good state if both "git diff
      HEAD" and "git log master..origin/master" give no output.
 
-  3) Bump the version number in configure.ac. We seem to have settled
+  2) Bump the version number in configure.ac. We seem to have settled
      for 2.4.x as the versioning scheme for libdrm, so just bump the
      micro version.
 
-  4) Run autoconf and then re-run ./configure so the build system
+  3) Run autoconf and then re-run ./configure so the build system
      picks up the new version number.
 
-  5) (optional step, release.sh will make distcheck for you, but it can be
+  4) (optional step, release.sh will make distcheck for you, but it can be
       heart warming to verify that make distcheck passes)
 
      Verify that the code passes "make distcheck".  Running "make
@@ -36,20 +36,20 @@ Follow these steps to release a new version of libdrm:
      Make sure that the version number reported by distcheck and in
      the tarball names matches the number you bumped to in configure.ac.
 
-  6) Commit the configure.ac change and make an annotated tag for that
+  5) Commit the configure.ac change and make an annotated tag for that
      commit with the version number of the release as the name and a
      message of "libdrm X.Y.Z".  For example, for the 2.4.16 release
      the command is:
 
 	git tag -a 2.4.16 -m "libdrm 2.4.16"
 
-  7) Push the commit and tag by saying
+  6) Push the commit and tag by saying
 
 	git push --tags origin master
 
      assuming the remote for the upstream libdrm repo is called origin.
 
-  6) Use the release.sh script from the xorg/util/modular repo to
+  8) Use the release.sh script from the xorg/util/modular repo to
      upload the tarballs to the freedesktop.org download area and
      create an annouce email template.  The script takes one argument:
      the path to the libdrm checkout. So, if a checkout of modular is
-- 
1.8.3.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 3/3] RELEASING: Fix annouce typo

[Damien Lespiau]

That's the only type :set spell found.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 RELEASING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASING b/RELEASING
index 8ed7490..78e90c0 100644
--- a/RELEASING
+++ b/RELEASING
@@ -51,7 +51,7 @@ Follow these steps to release a new version of libdrm:
 
   8) Use the release.sh script from the xorg/util/modular repo to
      upload the tarballs to the freedesktop.org download area and
-     create an annouce email template.  The script takes one argument:
+     create an announce email template.  The script takes one argument:
      the path to the libdrm checkout. So, if a checkout of modular is
      at the same level than the libdrm repo:
 
-- 
1.8.3.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 3/3] RELEASING: Fix annouce typo

[Ilia Mirkin]

On Thu, Mar 19, 2015 at 12:35 PM, Damien Lespiau
<damien.lespiau@intel.com> wrote:
> That's the only type :set spell found.
                  ---^

But it didn't find this one :)

>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  RELEASING | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/RELEASING b/RELEASING
> index 8ed7490..78e90c0 100644
> --- a/RELEASING
> +++ b/RELEASING
> @@ -51,7 +51,7 @@ Follow these steps to release a new version of libdrm:
>
>    8) Use the release.sh script from the xorg/util/modular repo to
>       upload the tarballs to the freedesktop.org download area and
> -     create an annouce email template.  The script takes one argument:
> +     create an announce email template.  The script takes one argument:
>       the path to the libdrm checkout. So, if a checkout of modular is
>       at the same level than the libdrm repo:
>
> --
> 1.8.3.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/3] RELEASING: Fix the step numbering

[Emil Velikov]

On 19/03/15 16:35, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  RELEASING | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/RELEASING b/RELEASING
> index e17dbea..8ed7490 100644
> --- a/RELEASING
> +++ b/RELEASING
> @@ -13,14 +13,14 @@ Follow these steps to release a new version of libdrm:
...
> -  7) Push the commit and tag by saying
> +  6) Push the commit and tag by saying
>  
>  	git push --tags origin master
>  
>       assuming the remote for the upstream libdrm repo is called origin.
>  
> -  6) Use the release.sh script from the xorg/util/modular repo to
> +  8) Use the release.sh script from the xorg/util/modular repo to
This should be 7 :-)

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/3] RELEASING: Fix the step numbering

[Damien Lespiau]

On Thu, Mar 19, 2015 at 05:32:28PM +0000, Emil Velikov wrote:
> On 19/03/15 16:35, Damien Lespiau wrote:
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> > ---
> >  RELEASING | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/RELEASING b/RELEASING
> > index e17dbea..8ed7490 100644
> > --- a/RELEASING
> > +++ b/RELEASING
> > @@ -13,14 +13,14 @@ Follow these steps to release a new version of libdrm:
> ...
> > -  7) Push the commit and tag by saying
> > +  6) Push the commit and tag by saying
> >  
> >  	git push --tags origin master
> >  
> >       assuming the remote for the upstream libdrm repo is called origin.
> >  
> > -  6) Use the release.sh script from the xorg/util/modular repo to
> > +  8) Use the release.sh script from the xorg/util/modular repo to
> This should be 7 :-)

I'm crying a little. Can't count and typoed a patch that fixed a typo.

-- 
Damien
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/3] RELEASING: Fix releasing instructions to match the latest release.sh

[Emil Velikov]

On 19/03/15 16:35, Damien Lespiau wrote:
> It seems that the tests don't need DRM master anymore? at least make
> distcheck passes when X is running.
> 
> release.sh is also invoked with just the path to the libdrm git checkout
> and we don't want to pass additional arguments that will be treated as
> additional modules we want to release.
> 
> Also, make a note that release.sh will run make distcheck for you, so we
> don't strickly need to run it beforehand.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  RELEASING | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/RELEASING b/RELEASING
> index 3f07146..e17dbea 100644
> --- a/RELEASING
> +++ b/RELEASING
> @@ -20,13 +20,12 @@ Follow these steps to release a new version of libdrm:
>    4) Run autoconf and then re-run ./configure so the build system
>       picks up the new version number.
>  
> -  5) Verify that the code passes "make distcheck".  libdrm is tricky
> -     to distcheck since the test suite will need to become drm master.
> -     This means that you need to run it outside X, that is, in text
> -     mode (KMS or no KMS doesn't matter).
> +  5) (optional step, release.sh will make distcheck for you, but it can be
> +      heart warming to verify that make distcheck passes)
>  
> -     Running "make distcheck" should result in no warnings or errors
> -     and end with a message of the form:
> +     Verify that the code passes "make distcheck".  Running "make
> +     distcheck" should result in no warnings or errors and end with a
> +     message of the form:
>  
Side note: Pretty sure that current make distcheck produces a handful of
warnings ;-)

Although we'll try to have them sorted by next release.

With my comment in patch 2 and Ilia's in 3 the series is
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>

Thanks for the update.
Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/3] RELEASING: Fix releasing instructions to match the latest release.sh

[Damien Lespiau]

On Thu, Mar 19, 2015 at 05:39:06PM +0000, Emil Velikov wrote:
> On 19/03/15 16:35, Damien Lespiau wrote:
> > -     Running "make distcheck" should result in no warnings or errors
> > -     and end with a message of the form:
> > +     Verify that the code passes "make distcheck".  Running "make
> > +     distcheck" should result in no warnings or errors and end with a
> > +     message of the form:
> >  
> Side note: Pretty sure that current make distcheck produces a handful of
> warnings ;-)

Yup, it does, that'll have to be for another time though.

> Although we'll try to have them sorted by next release.

That'd be excellent.

> With my comment in patch 2 and Ilia's in 3 the series is
> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>

Done and pushed, thanks for the review!

-- 
Damien
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel