Updated missing steps into release engineering branch configuration doc.

refs #6916

diff --git a/releng/doc/release.html b/releng/doc/release.html
index 757a7a2e454d452ee319bfa9ede0fd8d7600e77d..6f0fd975306c2bdf486efac5ef01c1ca685c0247 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,17 @@ 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 `org.simantics.sdk` feature in `features/org.simantics.sdk.feature/feature.xml` to `x.y.z[.w]`.</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>Now commit and push the changes to the release branch.</p>
+</li>
 </ol>
 <h3>Initialize release branch distribution web site</h3>
 <ul>

diff --git a/releng/doc/release.md b/releng/doc/release.md
index 3ce2a0c691577b6ea97d6c41d8424097bd415b27..6d55c144db228408b2b2daf2aa1bf96a6b41ade9 100644 (file)
--- a/releng/doc/release.md
+++ b/releng/doc/release.md
@@ -84,11 +84,15 @@ With service releases, branch from an existing `release/*` branch instead.
    * `simantics.target`
    * `org.simantics.sdk.build.targetdefinition.target`
 
-   At the beginning of simantics.target file, increment `sequenceNumber` by 1
+   At the beginning of simantics.target file, increment `sequenceNumber` by 1 and replace
+   the version numbers in target name and `org.simantics.sdk.feature.group` and
+   `org.simantics.sdk.source.feature.group` with `x.y.z[.w]`:
    ~~~
    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
    <?pde version="3.8"?>
    <target name="Simantics x.y.z[.w]" sequenceNumber="11">
+   <unit id="org.simantics.sdk.feature.group" version="x.y.z[.w]"/>
+   <unit id="org.simantics.sdk.source.feature.group" version="x.y.z[.w]"/>
    ~~~
 
    Next, replace the following rows in both mentioned files:   
@@ -107,6 +111,15 @@ With service releases, branch from an existing `release/*` branch instead.
    <repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/manual"/>
    ~~~
 
+3. Edit version number of `org.simantics.sdk` feature in `features/org.simantics.sdk.feature/feature.xml` to `x.y.z[.w]`.
+   ~~~
+   <feature
+         id="org.simantics.sdk"
+         label="Simantics SDK"
+         version="x.y.z"
+         provider-name="VTT Technical Research Centre of Finland">
+   ~~~
+
 ### Initialize release branch distribution web site
 
 * Run [SDK/Deploy External Components to Web](https://www.simantics.org/jenkins/job/SDK/job/Deploy%20External%20Components%20to%20Web/) build with parameters: