(refs #7250) Merging master, minor CHR bugfixes

[simantics/platform.git] / releng / doc / release.html

diff --git a/releng/doc/release.html b/releng/doc/release.html
index 757a7a2e454d452ee319bfa9ede0fd8d7600e77d..df0f9d70f5cc3da78118f903ebd3e552e905e192 100644 (file)
--- a/releng/doc/release.html
+++ b/releng/doc/release.html
@@ -375,10 +375,14 @@ git checkout release/x.y.z[.w]
 <li><code>simantics.target</code></li>
 <li><code>org.simantics.sdk.build.targetdefinition.target</code></li>
 </ul>
-<p>At the beginning of simantics.target file, increment <code>sequenceNumber</code> by 1</p>
+<p>At the beginning of simantics.target file, increment <code>sequenceNumber</code> by 1 and replace
+the version numbers in target name and <code>org.simantics.sdk.feature.group</code> and
+<code>org.simantics.sdk.source.feature.group</code> with <code>x.y.z[.w]</code>:</p>
 <pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
 &lt;?pde version=&quot;3.8&quot;?&gt;
 &lt;target name=&quot;Simantics x.y.z[.w]&quot; sequenceNumber=&quot;11&quot;&gt;
+&lt;unit id=&quot;org.simantics.sdk.feature.group&quot; version=&quot;x.y.z[.w]&quot;/&gt;
+&lt;unit id=&quot;org.simantics.sdk.source.feature.group&quot; version=&quot;x.y.z[.w]&quot;/&gt;
 </code></pre>
 <p>Next, replace the following rows in both mentioned files:</p>
 <pre><code>&lt;repository location=&quot;http://www.simantics.org/download/master/sdk&quot;/&gt;
@@ -391,6 +395,41 @@ git checkout release/x.y.z[.w]
 &lt;repository location=&quot;http://www.simantics.org/download/release/x.y.z[.w]/external-components/manual&quot;/&gt;
 </code></pre>
 </li>
+<li>
+<p>Edit version number of <code>org.simantics.sdk</code> feature in <code>features/org.simantics.sdk.feature/feature.xml</code> to <code>x.y.z[.w]</code>.</p>
+<pre><code>&lt;feature
+      id=&quot;org.simantics.sdk&quot;
+      label=&quot;Simantics SDK&quot;
+      version=&quot;x.y.z&quot;
+      provider-name=&quot;VTT Technical Research Centre of Finland&quot;&gt;
+</code></pre>
+<p>An example of these changes can be seen in <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/platform.git;a=commit;h=bab5c9bd68277c76dc5c20bc7a60a9896cbd1540">gitweb</a>.</p>
+</li>
+<li>
+<p>Ensure that Redmine has a release engineering issue for the branched release, such as <a href="https://www.simantics.org/redmine/issues/7263">Simantics 1.30.0 release engineering</a>. Make a copy of the previous release issue to create the new one. Include link to original issue while copying.</p>
+</li>
+<li>
+<p>Commit the changes made</p>
+<pre><code> git commit -a
+</code></pre>
+<p>with the commit message</p>
+<pre><code> Configured release/x.y.z[.w] branch for SDK builds.
+
+ refs #xxxx
+</code></pre>
+<p>where <code>#xxxx</code> is the number of the x.y.z[.w] release engineering issue and push them to remote</p>
+<pre><code> git push origin release/x.y.z[.w]
+</code></pre>
+</li>
+<li>
+<p>If you are branching from <code>master</code>, bump the revision of master right now to start the next release cycle in master.
+An example of these changes can be seen in <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/platform.git;a=commitdiff;h=ae93c9930c6345c32219e6845b9e72e9d9d2d28c">gitweb</a>.</p>
+<p>Commit the changes with the following commit message</p>
+<pre><code>Bumped master target and org.simantics.sdk feature versions to x.y.z[.w].
+refs #yyyy
+</code></pre>
+<p>where <code>#yyyy</code> is the number of the next release's release engineering issue.</p>
+</li>
 </ol>
 <h3>Initialize release branch distribution web site</h3>
 <ul>
@@ -466,7 +505,7 @@ is to back up the mysql database backing the wiki. Should the wiki be required
 at a later time for some reason, we'll put the documentation up then in a
 separate Mediawiki installation.</p>
 <ol>
-<li>Dump documentation wiki databases using [dump-wikis.sh](./dump-wikis.sh) script.</li>
+<li>Dump documentation wiki databases using <a href="./dump-wikis.sh">dump-wikis.sh</a> script.</li>
 <li>Put the generated backup x.y.z.tar.gz at /var/backup/simantics-releases/x.y.z/wiki/</li>
 </ol>
 <h2>Compile change log entry</h2>