[PATCH] Update prepare-release.sh for Makefile* and date ranges.

[PATCH] Update prepare-release.sh for Makefile* and date ranges.

[Mark Wielaard]

Given that we might have to do a new 1.0.8 release soon I double checked
the prepare-release.sh script and noticed some version number comments
weren't updated in the Makefiles. And the date range in the manual, and
some comments was stuck on 1996-2010.


Also update the version number in the Makefile comments.
And update any date ranges to include the current year.
---
 prepare-release.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/prepare-release.sh b/prepare-release.sh
index db736b7..a1ae375 100755
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -20,23 +20,25 @@ fi
 LANG=C
 VERSION="$1"
 DATE=$(date +"%d %B %Y")
+DAY=$(date +"%d")
+MONTH=$(date +"%B")
+SHORTMONTH=$(date +"%b")
+YEAR=$(date +"%Y")
 
-# Replace the version strings in the comments
+# Replace the version strings and date ranges in the comments
 VER_PREFIX="bzip2/libbzip2 version "
 sed -i -e "s@${VER_PREFIX}[0-9].*@${VER_PREFIX}${VERSION} of ${DATE}@" \
-  CHANGES LICENSE README* *.c *.h *.pl *.sh
+       -e "s@ (C) \([0-9]\+\)-[0-9]\+ @ (C) \1-$YEAR @" \
+  CHANGES LICENSE Makefile* README* *.c *.h *.pl *.sh
 
 # Add an entry to the README
-DAY=$(date +"%d")
-MONTH=$(date +"%B")
-SHORTMONTH=$(date +"%b")
-YEAR=$(date +"%Y")
 printf "%2s %8s %s\n" "$DAY" "$MONTH" "$YEAR (bzip2, version $VERSION)" \
   >> README
 
 # Update manual
 sed -i -e "s@ENTITY bz-version \".*\"@ENTITY bz-version \"$VERSION\"@" \
        -e "s@ENTITY bz-date \".*\"@ENTITY bz-date \"$DAY $MONTH $YEAR\"@" \
+       -e "s@ENTITY bz-lifespan \"\([0-9]\+\)-[0-9]\+\"@ENTITY bz-filespan \"\1-$YEAR\"@"\
   entities.xml
 
 # bzip2.1 should really be generated from the manual.xml, but currently
-- 
1.8.3.1

Re: [PATCH] Update prepare-release.sh for Makefile* and date ranges.

[Mark Wielaard]

On Wed, Jul 03, 2019 at 10:28:00PM +0200, Mark Wielaard wrote:
> Given that we might have to do a new 1.0.8 release soon I double checked
> the prepare-release.sh script and noticed some version number comments
> weren't updated in the Makefiles. And the date range in the manual, and
> some comments was stuck on 1996-2010.
> 
> 
> Also update the version number in the Makefile comments.
> And update any date ranges to include the current year.

It seems to work as intended. I pushed it to sourceware git.

> ---
>  prepare-release.sh | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/prepare-release.sh b/prepare-release.sh
> index db736b7..a1ae375 100755
> --- a/prepare-release.sh
> +++ b/prepare-release.sh
> @@ -20,23 +20,25 @@ fi
>  LANG=C
>  VERSION="$1"
>  DATE=$(date +"%d %B %Y")
> +DAY=$(date +"%d")
> +MONTH=$(date +"%B")
> +SHORTMONTH=$(date +"%b")
> +YEAR=$(date +"%Y")
>  
> -# Replace the version strings in the comments
> +# Replace the version strings and date ranges in the comments
>  VER_PREFIX="bzip2/libbzip2 version "
>  sed -i -e "s@${VER_PREFIX}[0-9].*@${VER_PREFIX}${VERSION} of ${DATE}@" \
> -  CHANGES LICENSE README* *.c *.h *.pl *.sh
> +       -e "s@ (C) \([0-9]\+\)-[0-9]\+ @ (C) \1-$YEAR @" \
> +  CHANGES LICENSE Makefile* README* *.c *.h *.pl *.sh
>  
>  # Add an entry to the README
> -DAY=$(date +"%d")
> -MONTH=$(date +"%B")
> -SHORTMONTH=$(date +"%b")
> -YEAR=$(date +"%Y")
>  printf "%2s %8s %s\n" "$DAY" "$MONTH" "$YEAR (bzip2, version $VERSION)" \
>    >> README
>  
>  # Update manual
>  sed -i -e "s@ENTITY bz-version \".*\"@ENTITY bz-version \"$VERSION\"@" \
>         -e "s@ENTITY bz-date \".*\"@ENTITY bz-date \"$DAY $MONTH $YEAR\"@" \
> +       -e "s@ENTITY bz-lifespan \"\([0-9]\+\)-[0-9]\+\"@ENTITY bz-filespan \"\1-$YEAR\"@"\
>    entities.xml
>  
>  # bzip2.1 should really be generated from the manual.xml, but currently
> -- 
> 1.8.3.1
>