# HG changeset patch # User David Demelier # Date 1456769742 -3600 # Node ID b6364997eb84573c4d9286391400b107a325ee7f # Parent 799905cca202571552d8d8c0b89d46fce6249542 CMake: set manual dates from IrccdVersion.cmake diff -r 799905cca202 -r b6364997eb84 cmake/IrccdVersion.cmake --- a/cmake/IrccdVersion.cmake Mon Feb 29 14:24:57 2016 +0100 +++ b/cmake/IrccdVersion.cmake Mon Feb 29 19:15:42 2016 +0100 @@ -21,7 +21,19 @@ set(IRCCD_VERSION_MINOR "0") set(IRCCD_VERSION_PATCH "0") set(IRCCD_VERSION "${IRCCD_VERSION_MAJOR}.${IRCCD_VERSION_MINOR}.${IRCCD_VERSION_PATCH}") -set(IRCCD_RELEASE_DATE "2015-12-17") + +# +# Irccd release date. +# ------------------------------------------------------------------- +# +# IRCCD_RELEASE_DATE_YEAR 4 digits +# IRCCD_RELEASE_DATE_MONTH 2 digits (01 = January) +# IRCCD_RELEASE_DATE_DAY 2 digits (01 = first day of month) +# +set(IRCCD_RELEASE_DATE_YEAR 2016) +set(IRCCD_RELEASE_DATE_MONTH 02) +set(IRCCD_RELEASE_DATE_DAY 29) +set(IRCCD_RELEASE_DATE "${IRCCD_RELEASE_DATE_YEAR}-${IRCCD_RELEASE_DATE_MONTH}-${IRCCD_RELEASE_DATE_DAY}") # All plugins. set( diff -r 799905cca202 -r b6364997eb84 doc/man/CMakeLists.txt --- a/doc/man/CMakeLists.txt Mon Feb 29 14:24:57 2016 +0100 +++ b/doc/man/CMakeLists.txt Mon Feb 29 19:15:42 2016 +0100 @@ -20,11 +20,30 @@ # Install manuals # ------------------------------------------------------------------- +set( + MONTHS + January + February + March + April + May + June + July + August + September + October + November + December +) + +# Get month as name. +math(EXPR INDEX "${IRCCD_RELEASE_DATE_MONTH} - 1") +list(GET MONTHS ${INDEX} MONTH) + +set(YEAR ${IRCCD_RELEASE_DATE_YEAR}) +set(DAY ${IRCCD_RELEASE_DATE_DAY}) + # Update man pages date -set(MONTH "February") -set(DAY 29) -set(YEAR 2016) - irccd_define_man(irccd.1 man1) irccd_define_man(irccd.conf.5 man5) irccd_define_man(irccdctl.1 man1) diff -r 799905cca202 -r b6364997eb84 doc/procs/00.new-release.md --- a/doc/procs/00.new-release.md Mon Feb 29 14:24:57 2016 +0100 +++ b/doc/procs/00.new-release.md Mon Feb 29 19:15:42 2016 +0100 @@ -5,17 +5,21 @@ 1. Switch to the appropriate release branch. -Example, if about to release 2.0.5 : +Example, if about to release 2.0.5: -$ hg update release-2.0 + $ hg update release-2.0 -2. Change the version number in the cmake/IrccdVersion.cmake file. +2. Change the version and date in the cmake/IrccdVersion.cmake file. Example: -set(IRCCD_VERSION_MAJOR "3") -set(IRCCD_VERSION_MINOR "5") -set(IRCCD_VERSION_PATCH "8") + set(IRCCD_VERSION_MAJOR "2") + set(IRCCD_VERSION_MINOR "0") + set(IRCCD_VERSION_PATCH "5") + + set(IRCCD_RELEASE_DATE_YEAR 2016) + set(IRCCD_RELEASE_DATE_MONTH 12) + set(IRCCD_RELEASE_DATE_DAY 31) 3. Update or verify the CHANGES.md file @@ -23,24 +27,28 @@ You must remove the "This is a development version" notice from the file and change the version. -5. For each plugin, update versions +5. Change the version in the irccd guide. -All plugins always have the same version as irccd. +6. Create a new tag x.y.z -6. Change the version in the irccd guide. + $ hg tag 2.0.5 -7. Create a new tag x.y.z +7. Create the signature of the tag + + $ hg sign 8. Push the changes and merge by top-porting it Example: -$ hg push -$ hg update stable-2 -$ hg merge release-2.0 -$ hg up default -$ hg merge release-2.0 + $ hg update stable-2 + $ hg merge release-2.0 + $ hg ci -m "Merge with release-2.0" + $ hg up @ + $ hg merge release-2.0 + $ hg ci -m "Merge with stable-2" + $ hg push 9. Create the package -$ make release \ No newline at end of file + $ make release