Changes between Version 47 and Version 48 of ReleaseProcedure


Ignore:
Timestamp:
Apr 27, 2008, 8:04:08 PM (13 years ago)
Author:
Peter Johansson
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ReleaseProcedure

    v47 v48  
    166166   i. In section '''svndigest ''devel'' ''' update link to `[milestone:"svndigest A.B+1" A.B+1]`.[[br]][[br]]
    167167   i. On WikiStart update links `[source:tags/A.B/doc/readme.txt Manual]`, `[source:tags/A.B/NEWS NEWS]`, `[source:tags/A.B/README README]`, and also make sure that list of features is up to date.[[br]][[br]]
     168  1. Merge the patch release into the trunk. To avoid confusion and
     169     minimize the risk of loosing fixes, this step is only performed by
     170     the Merge Master. [[br]][[br]]
     171   i. Checkout a pristine version of the trunk.
     172{{{
     173svn checkout http://lev.thep.lu.se/repository/svndigest/trunk trunk_merge
     174}}}
     175   i. Merge changes into trunk. In this example the diffence between a
     176      minor release tag and the first patch release tag is merged into
     177      the trunk WC
     178{{{
     179cd trunk_merge
     180svn merge http://lev.thep.lu.se/repository/svndigest/branches/A.B-stable@[fork] \
     181          http://lev.thep.lu.se/repository/svndigest/branches/A.B-stable
     182}}}
     183   i. Resolve all conflicts. Run tests and perform all other
     184      appropriate tests to make sure that the merge does not create
     185      havoc. [[br]][[br]]
     186   i. Commit changes to the trunk branch.
     187{{{
     188svn commit -m "Merged branch A.B-stable to the trunk. Delta A.B - A.B@[fork]"
     189}}}
    168190  1. Prepare the minor branch for the first patch release [[br]][[br]]
    169191   i. Go to release branch directory
     
    171193cd path/to/svndigest-stable-branch/
    172194}}}
    173    i. Update version number in `configure.ac`. Locate and change the
     195   i. Update version number in `version.m4`. Locate and change the
    174196      below line
    175197{{{
     
    262284    Remember to set the date [[br]][[br]]
    263285  1. Update DownloadPage and [wiki:WikiStart WikiStart][[br]][[br]]
    264   i. Update the section '''Latest stable release''' to reflect the new
    265      version, that is [[br]][[br]]
    266    * Change the version number [[br]][[br]]
    267    * Update the package link to the new version [[br]][[br]]
    268    * Update link to NEWS file to `source:tags/A.B.C/NEWS` [[br]][[br]]
    269   i. In section '''svndigest ''latest release'' ''' update link to
     286   i. Update the section '''Latest stable release''' to reflect the new
     287      version, that is [[br]][[br]]
     288    * Change the version number [[br]][[br]]
     289    * Update the package link to the new version [[br]][[br]]
     290    * Update link to NEWS file to `source:tags/A.B.C/NEWS` [[br]][[br]]
     291   i. In section '''svndigest ''latest release'' ''' update link to
    270292     `[source:tags/A.B.C/NEWS NEWS]` and modify the svn commands to
    271293{{{
     
    275297svn switch http://lev.thep.lu.se/repository/svndigest/tags/A.B.C
    276298}}}
    277   i. In section '''svndigest ''stable'' ''' update link to
    278      `[milestone:"svndigest A.B.[C+1]" A.B.[C+1]]`.[[br]][[br]]
    279   i. On WikiStart update reference to explicit latest version number, and links `[source:tags/A.B/doc/readme.txt Manual]`, `[source:tags/A.B/NEWS NEWS]`, and `[source:tags/A.B/INSTALL Install]`.[[br]][[br]]
    280   1. Prepare the minor branch for the next patch release [[br]][[br]]
    281    i. Update version number in `configure.ac`. Locate and change the
    282       below line
    283 {{{
    284 m4_define([PATCH_VERSION], [C+1])
    285 m4_define([SVNDIGEST_DEV_BUILD], [true])
    286 }}}
    287    i. Add an entry in `NEWS`
    288 {{{
    289 version A.B.[C+1] (released DATE)
    290 }}}
    291       The date is set when version A.B.[C+1] is released. [[br]][[br]]
    292    i. Add an entry in `ChangeLog`
    293 {{{
    294 version A.B.[C+1]:
    295         - http://trac.thep.lu.se/svndigest/log/branches/A.B-stable?rev=HEAD&stop_rev=[M+1]
    296         - http://trac.thep.lu.se/svndigest/query?milestone=A.B.[C+1]&order=id
    297 }}}
    298    i. Commit changes to the repository,
    299       `svn ci -m "Changes for future release A.B.[C+1]"` [[br]][[br]]
     299   i. In section '''svndigest ''stable'' ''' update link to
     300      `[milestone:"svndigest A.B.[C+1]" A.B.[C+1]]`.[[br]][[br]]
     301   i. On WikiStart update reference to explicit latest version number, and links `[source:tags/A.B/doc/readme.txt Manual]`,  `[source:tags/A.B/NEWS NEWS]`, and `[source:tags/A.B/INSTALL Install]`.[[br]][[br]]
    300302  1. Merge the patch release into the trunk. To avoid confusion and
    301303     minimize the risk of loosing fixes, this step is only performed by
     
    320322svn commit -m "Merged patch release A.B.1 to the trunk. Delta A.B.1 - A.B"
    321323}}}
     324  1. Prepare the minor branch for the next patch release [[br]][[br]]
     325   i. Update version number in `configure.ac`. Locate and change the
     326      below line
     327{{{
     328m4_define([PATCH_VERSION], [C+1])
     329m4_define([SVNDIGEST_DEV_BUILD], [true])
     330}}}
     331   i. Add an entry in `NEWS`
     332{{{
     333version A.B.[C+1] (released DATE)
     334}}}
     335      The date is set when version A.B.[C+1] is released. [[br]][[br]]
     336   i. Add an entry in `ChangeLog`
     337{{{
     338version A.B.[C+1]:
     339        - http://trac.thep.lu.se/svndigest/log/branches/A.B-stable?rev=HEAD&stop_rev=[M+1]
     340        - http://trac.thep.lu.se/svndigest/query?milestone=A.B.[C+1]&order=id
     341}}}
     342   i. Commit changes to the repository,
     343      `svn ci -m "Changes for future release A.B.[C+1]"` [[br]][[br]]
    322344  1. Close the milestone associated with the release and replace `head` with appropriate revision in log link. Add a new
    323345     milestone as needed (with a log link).