mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-26 15:21:51 -08:00
209 lines
10 KiB
HTML
209 lines
10 KiB
HTML
<?xml version="1.0" encoding="UTF-8"?>
|
||
|
||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
|
||
|
||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||
|
||
<head>
|
||
|
||
<title>Memory Pool System Version Creation Procedure</title>
|
||
|
||
</head>
|
||
|
||
<body bgcolor="#FFFFFF" text="#000000" link="#000099" vlink="#660066" alink="#FF0000">
|
||
|
||
<div align="center">
|
||
|
||
<p>
|
||
<a href="/">Ravenbrook</a> /
|
||
<a href="/project/">Projects</a> /
|
||
<a href="/project/mps/">Memory Pool System</a> /
|
||
<a href="/project/mps/master/">Master Product Sources</a> /
|
||
<a href="/project/mps/master/procedure/">Procedures</a>
|
||
</p>
|
||
|
||
<p><i><a href="/project/mps/">Memory Pool System Project</a></i></p>
|
||
|
||
<hr />
|
||
|
||
|
||
<h1>Memory Pool System Version Creation Procedure</h1>
|
||
|
||
<address>
|
||
<a href="mailto:rb@ravenbrook.com">Richard Kistruck</a>,
|
||
<a href="http://www.ravenbrook.com/">Ravenbrook Limited</a>,
|
||
2008-10-29
|
||
</address>
|
||
|
||
</div>
|
||
|
||
|
||
<h2><a id="section-1" name="section-1">1. Introduction</a></h2>
|
||
|
||
<p>This document tells you how to create a new version from the master sources. (For example, if the last version of the MPS is 1.105, with releases 1.105.0 and 1.105.1, this document tells you how to abandon the 1.105 lineage and take a new clone from the master sources to create version 1.106). </p>
|
||
|
||
<p>Readership: MPS staff. Confidential: no. Status: rough notes, informally peer-reviewed.</p>
|
||
|
||
<p>Background: refer to PQTCM ("Product Quality Through Change Management", <a href="http://www.ravenbrook.com/doc/1999/05/20/pqtcm/">http://www.ravenbrook.com/doc/1999/05/20/pqtcm/</a>) for background, terminology, rationale, and usage guidance. This tells you what "a version" actually is.</p>
|
||
|
||
|
||
<h2><a id="section-2" name="section-2">2. Preamble</a></h2>
|
||
|
||
<h3>2.1. Do I need this procedure?</h3>
|
||
|
||
<p>You might not need to create a new version. An alternative is to create a further ‘point release’ on the existing version. Refer to PQTCM when deciding. (Summary: am I changing the specification?). </p>
|
||
|
||
|
||
<h3>2.2. What is a version?</h3>
|
||
|
||
<p> A version is a ‘clone’ of all the master source files, that then has its own evolution. A version has these parts:</p>
|
||
|
||
<ol>
|
||
|
||
<li><p>A version name, consisting of a major version number <code>A</code> and a minor version number <code>BBB</code>.</p></li>
|
||
|
||
<li>
|
||
<p>A Perforce branch specification that defines the mapping used between the master sources and the sources on the version branch. By convention, the name of the branch is <code>mps/version/A.BBB</code>: note that we make the branch name exactly match the pathname of that version's sub-tree. For example: </p>
|
||
<blockquote><pre><code>$ p4 branch -o mps/version/1.105
|
||
Branch: mps/version/1.105
|
||
|
||
Description:
|
||
Branching master sources for version 1.105.
|
||
|
||
View:
|
||
//info.ravenbrook.com/project/mps/master/... //info.ravenbrook.com/project/mps/version/1.105/...
|
||
</code></pre></blockquote>
|
||
</li>
|
||
|
||
<li><p>Cloned (integrated) and submitted files, in the <code>version/A.BBB/...</code> sub-tree. Usually this is a clone of the entire <code>master/...</code> subtree and all its files. These were created in a single change by running <code>p4 integrate -b mps/version/A.BBB</code>. This initial integrate is what populates the version branch with files; before that it was empty. For each of these files, Perforce reports the first action as “<code>branch</code>”. Some files may then be further modified. </p></li>
|
||
|
||
<li><p>Origin: The point in time that the initial integrate was performed, expressed as its changelevel minus one, defines the “Origin” of the version. This is the last change on the master sources that also made it into the version sources by virtue of the initial integrate command.</p></li>
|
||
|
||
<li><p>Entry in the table at <a href="http://info.ravenbrook.com/project/mps/version/">//info.ravenbrook.com/project/mps/version/</a>.</p></li>
|
||
|
||
</ol>
|
||
|
||
|
||
<h2><a id="section-3" name="section-3">3. Procedure: How to make a new version</a></h2>
|
||
|
||
<ol>
|
||
|
||
<li><p>Consider each deprecated feature (by grepping the manual sources for <code>deprecated::</code> sections) and decide whether it needs to be removed from the version you are about to make (and all subsequent versions). Remove features from the master sources before making the version branch.</p></li>
|
||
|
||
<li><p>Choose the version number for the new version. Typically this has the same major version number as the previous version, and the next minor version number. Thus 1.104 is followed by 1.105. [TODO: when does the major version number change?]</p></li>
|
||
|
||
<li><p>Make sure you have the new version branch mapped to your client workspace: run <code>p4 client</code> and check that there is a mapping for <code>//info.ravenbrook.com/project/mps/version/A.BBB/...</code>.</p></li>
|
||
|
||
<li><p>In the master sources, edit <a href="../../code/version.c"><code>code/version.c</code></a> and change <code>MPS_RELEASE</code> to refer to the version you are about to create (using <code>.0</code> for the release), and update <code>MPSCopyrightNotice</code> to include the current year. Submit this file to Perforce. [Note that <code>MPS_RELEASE</code> in this file is used to populate the release number for the Sphinx documentation: see <a href="../../manual/source/conf.py"><code>manual/source/conf.py</code></a>.]</p></li>
|
||
|
||
<li><p>Determine the origin of the branch: run <code>p4 changes -m 1 //info.ravenbrook.com/project/mps/master/...</code> and note the output changelevel (this is called <code>ORIGIN</code> in the examples below).</li></p>
|
||
|
||
<li><p>Make the branch: <code>p4 branch mps/version/A.BBB</code> and edit the branch specification to read as follows:</p>
|
||
|
||
<blockquote><pre><code>Branch: mps/version/A.BBB
|
||
|
||
Description:
|
||
Branching master sources for version A.BBB.
|
||
|
||
View:
|
||
//info.ravenbrook.com/project/mps/master/... //info.ravenbrook.com/project/mps/version/A.BBB/...
|
||
</code></pre></blockquote></li>
|
||
|
||
<li><p>Make sure you have no unsubmitted files, and then run <code>p4 integrate -b mps/version/A.BBB //info.ravenbrook.com/project/mps/master/...@ORIGIN</code> and then <code>p4 submit</code>.</p></li>
|
||
|
||
<li><p>Update the table at <a href="http://info.ravenbrook.com/project/mps/version/">http://info.ravenbrook.com/project/mps/version/</a>.</p></li>
|
||
|
||
<li><p>
|
||
Edit Master->Version in documents that erroneously say "Master".
|
||
Always edit version/A.BBB/index.html, eg. (case-sensitive):
|
||
</p>
|
||
<blockquote><pre>"of the Master version" -> "of Version A.BBB"
|
||
"Master" -> "Version A.BBB"</pre></blockquote>
|
||
<p>
|
||
Less importantly, edit various other files. See change 30260.
|
||
</p></li>
|
||
|
||
<li><p>
|
||
Do an empty-integrate of this change back on to the masters, so P4 thinks
|
||
it's done and doesn't keep suggesting it:
|
||
</p>
|
||
<blockquote><pre>p4 integrate -r -b mps/version/A.BBB <Files Edited Master->Version>
|
||
p4 resolve -ay <Files Edited Master->Version>
|
||
</pre></blockquote></li>
|
||
|
||
</ol>
|
||
|
||
|
||
<h2><a id="section-A" name="section-A">A. References</a></h2>
|
||
|
||
<!-- Template Entry
|
||
|
||
<table>
|
||
|
||
<tr valign="top">
|
||
|
||
<td>[<a id="ref-#REF#" name="ref-#REF#" href="#REF_URL#">#REF_NAME#</a>]</td>
|
||
|
||
<td>
|
||
"#REF_TITLE#";
|
||
#REF_AUTHOR#;
|
||
<URL: <a href="#REF_URL#">#REF_URL#</a>>;
|
||
#REF_DATE#.
|
||
</td>
|
||
|
||
</tr>
|
||
|
||
</table>
|
||
|
||
-->
|
||
|
||
|
||
<h2><a id="section-B" name="section-B">B. Document History</a></h2>
|
||
|
||
<pre>
|
||
2005-10-03 RHSK Created.
|
||
2006-12-27 RHSK Step 0: edit some files on master before making version branch
|
||
2007-07-05 RHSK Releasename now also in w3build.bat. Make sure all submitted before integ.
|
||
2008-10-29 RHSK Convert from text to html.
|
||
2010-11-06 RHSK Correctly format example of p4 branch -o mps/version/1.105
|
||
2013-05-16 GDR readme.txt doesn’t need updating; w3build.bat no longer exists
|
||
</pre>
|
||
|
||
<h2><a id="section-C" name="section-C">C. Copyright and License</a></h2>
|
||
|
||
<p> This document is copyright © 2002, 2005-2008, 2010 <a href="http://www.ravenbrook.com/">Ravenbrook Limited</a>. All rights reserved. This is an open source license. Contact Ravenbrook for commercial licensing options. </p>
|
||
|
||
<p> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: </p>
|
||
|
||
<ol>
|
||
|
||
<li> Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. </li>
|
||
|
||
<li> Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. </li>
|
||
|
||
<li> Redistributions in any form must be accompanied by information on how to obtain complete source code for the this software and any accompanying software that uses this software. The source code must either be included in the distribution or be available for no more than the cost of distribution plus a nominal fee, and must be freely redistributable under reasonable conditions. For an executable file, complete source code means the source code for all modules it contains. It does not include source code for modules or files that typically accompany the major components of the operating system on which the executable file runs. </li>
|
||
|
||
</ol>
|
||
|
||
<p> <strong> This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability, fitness for a particular purpose, or non-infringement, are disclaimed. In no event shall the copyright holders and contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. </strong> </p>
|
||
|
||
|
||
<hr />
|
||
|
||
<div align="center">
|
||
|
||
<p><code>$Id$</code></p>
|
||
|
||
<p>
|
||
<a href="/">Ravenbrook</a> /
|
||
<a href="/project/">Projects</a> /
|
||
<a href="/project/mps/">Memory Pool System</a> /
|
||
<a href="/project/mps/master/">Master Product Sources</a> /
|
||
<a href="/project/mps/master/procedure/">Procedures</a>
|
||
</p>
|
||
|
||
</div>
|
||
|
||
</body>
|
||
|
||
</html>
|