Changeset 3671


Ignore:
Timestamp:
Aug 16, 2007, 10:07:23 AM (16 years ago)
Author:
Jari Häkkinen
Message:

Fixes #656. New release procedures are added to wiki:ReleaseProcedure.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/doc/development/index.html

    r2962 r3671  
    2626  <head>
    2727    <title>BASE - Development information</title>
    28   <link rel=stylesheet type="text/css" href="../styles.css">
     28  <link rel="stylesheet" type="text/css" href="../styles.css">
    2929  </head>
    3030<body>
    … …  
    5252    <li><a href="#plugins">Plug-ins</a>
    5353    <li><a href="#running">Running BASE in the subversion tree</a>
    54     <li><a href="#newrelease">Publishing a new release</a>
    5554    </ol>
    5655   
    … …  
    319318  </dl>
    320319
    321 
    322   <a name="newrelease">
    323   <h2>8. Publishing a new release</h2>
    324   </a>
    325 
    326   <p> <b> Publishing a bug fix release </b> <br>
    327   This section describes what to do when publishing a bug fix release
    328   of BASE, <i>e.g.</i> going from version 2.0.1 to 2.0.2.
    329   </p>
    330 
    331   <p>
    332   <ol type=a>
    333 
    334     <li>
    335       <p> Make sure that everything that all commits are performed
    336       into to the feature branch. Such as bumping version number(s) in
    337       build.xml.</p>
    338     </li>
    339 
    340     <li>
    341       <p> Create a tag using a one liner like
    342 <pre>
    343   svn copy http://lev.thep.lu.se/repository/base/branches/2.0.2 \
    344            http://lev.thep.lu.se/repository/base/tags/2.0.2 \
    345            -m "Tagging version 2.0.2"
    346 </pre>
    347       </p>
    348     </li>
    349 
    350     <li>
    351       <p> Upgrade the demo server. </p>
    352     </li>
    353 
    354     <li>
    355       <p> Create a new feature branch using a one liner like
    356 <pre>
    357   svn copy http://lev.thep.lu.se/repository/base/tags/2.0.2 \
    358            http://lev.thep.lu.se/repository/base/branches/2.0.3 \
    359            -m "New bug fix branch for 2.0"
    360 </pre>
    361       </p>
    362     </li>
    363 
    364     <li>
    365       <p> Update the version list in Trac using the trac-admin
    366       tool. </p>
    367     </li>
    368 
    369     <li>
    370       <p> Create new binary and source packages with 'ant
    371       package'. Publish the new version on
    372       <a href=http://base.thep.lu.se/wiki/DownloadPage>the
    373       wiki</a>. Also make the appropriate update to the download
    374       page. </p>
    375     </li>
    376 
    377     <li>
    378     <p> Merge the feature branch into the trunk. To avoid confusion
    379     and minimize the risk of loosing fixes, this step is only
    380     performed by the <i>Merge Master</i>. (Johan Enell is currently
    381     <i>Merge Master</i> and as the master he knows what he is doing.)
    382     <ol>
    383         <li> <p> Checkout a pristine version of the trunk.
    384 <pre>
    385   svn checkout http://lev.thep.lu.se/repository/base/trunk
    386 </pre>
    387         </p>
    388         </li>
    389         <li>
    390           <p> Merge changes into back into trunk. The branch started
    391           at revision N and ended at revision M.
    392 <pre>
    393   svn merge -r N:M http://lev.thep.lu.se/repository/base/branches/2.0.2
    394 </pre>
    395           </p>
    396         </li>
    397         <li>
    398           <p> Fix all conflicts. Run TestAll and do a installation to
    399           make sure that the merge succeeded. </p>
    400         </li>
    401         <li>
    402           <p> Add a log line in doc/merge.txt specifying what has been
    403           merged. </p>
    404         </li>
    405         <li>
    406           <p> Commit changes to trunk.
    407 <pre>
    408   svn commit -m "Merged log:branches/2.0.2#N:M trunk."
    409 </pre>
    410           </p>
    411         </li>
    412       </ol>
    413       </p>
    414     </li>
    415 
    416     <li>
    417       <p> Delete the old feature branch using a one liner like
    418 <pre>
    419   svn delete http://lev.thep.lu.se/repository/base/branches/2.0.2 \
    420           -m "Removed obsolete branch 2.0.2 superseded by source:/branches/2.0.3"
    421 </pre>
    422       </p>
    423     </li>
    424 
    425     <li>
    426       <p> Close the <a href=http://base.thep.lu.se/roadmap/>milestone
    427       associated with the release</a> and add a new milestone. </p>
    428     </li>
    429 
    430   </ol>
    431   </p>
    432 
    433 
    434   <p> <b> Publishing a minor release </b> <br>
    435   This section describes what to do when publishing a minor release
    436   of BASE, <i>e.g.</i> going from version 2.0.x to 2.1
    437   </p>
    438 
    439   <p>
    440   <ol type=a>
    441 
    442     <li>
    443       <p> Make sure that everything that all commits are performed
    444       into to the feature branch. Such as bumping version number(s) in
    445       build.xml.</p>
    446     </li>
    447 
    448     <li>
    449       <p> Create a tag using a one liner like
    450 <pre>
    451   svn copy http://lev.thep.lu.se/repository/base/trunk \
    452            http://lev.thep.lu.se/repository/base/tags/2.1 \
    453            -m "Tagging version 2.1"
    454 </pre>
    455       </p>
    456     </li>
    457 
    458     <li>
    459       <p> Upgrade the demo server. </p>
    460     </li>
    461 
    462     <li>
    463       <p> Create a new feature branch using a one liner like
    464 <pre>
    465   svn copy http://lev.thep.lu.se/repository/base/tags/2.1 \
    466            http://lev.thep.lu.se/repository/base/branches/2.1.1 \
    467            -m "New bug fix branch for 2.1"
    468 </pre>
    469       </p>
    470     </li>
    471 
    472     <li>
    473       <p> Update the version list in Trac using the trac-admin
    474       tool. </p>
    475     </li>
    476 
    477     <li>
    478       <p> Create new binary and source packages with 'ant
    479       package'. Publish the new version on
    480       <a href=http://base.thep.lu.se/wiki/DownloadPage>the
    481       wiki</a>. Also make the appropriate update to the download
    482       page. </p>
    483     </li>
    484 
    485     <li>
    486       <p> Close the <a href=http://base.thep.lu.se/roadmap/>milestone
    487       associated with the release</a> and add a new milestone. </p>
    488     </li>
    489 
    490   </ol>
    491   </p>
    492 
    493 
    494320</body>
    495321</html>
Note: See TracChangeset for help on using the changeset viewer.