Fixed release engineering target platform preparation instructions

refs #6621
refs #6848

Change-Id: I4d4b0b62ac1e87a841c6f9807d60ed3998fd2ede

diff --git a/releng/doc/release.html b/releng/doc/release.html
index e92cd1e6e4338ecd50a40f85bd578aff2453d36a..0708ef4c326f5c9a5d057d84ee4dc14591f52ea3 100644 (file)
--- a/releng/doc/release.html
+++ b/releng/doc/release.html
@@ -359,28 +359,41 @@ git checkout release/x.y.z[.w]
 </code></pre>\r
 </li>\r
 <li>\r
-<p>Edit the beginning of the file <code>releng/org.simantics.sdk.build.targetdefinition/simantics.target</code></p>\r
+<p>Edit all target platform files in  <code>releng/org.simantics.sdk.build.targetdefinition/</code>, i.e.</p>\r
+<ul>\r
+<li><code>simantics.target</code></li>\r
+<li><code>org.simantics.sdk.build.targetdefinition.target</code></li>\r
+<li><code>org.simantics.sdk.build.targetdefinition-semantum.target</code></li>\r
+</ul>\r
+<p>At the beginning of each .target file, increment <code>sequenceNumber</code> by 1</p>\r
 <pre><code>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;\r
 &lt;?pde version=&quot;3.8&quot;?&gt;\r
-&lt;target name=&quot;Simantics 1.25.0&quot; sequenceNumber=&quot;10&quot;&gt;\r
-&lt;locations&gt;\r
-&lt;location includeAllPlatforms=&quot;true&quot; includeConfigurePhase=&quot;false&quot; includeMode=&quot;slicer&quot; includeSource=&quot;true&quot; type=&quot;InstallableUnit&quot;&gt;\r
-&lt;unit id=&quot;org.simantics.sdk.feature.group&quot; version=&quot;1.25.0&quot;/&gt;\r
-&lt;repository location=&quot;http://www.simantics.org/download/master/sdk&quot;/&gt;\r
-&lt;/location&gt;\r
+&lt;target name=&quot;Simantics x.y.z[.w]&quot; sequenceNumber=&quot;11&quot;&gt;\r
+</code></pre>\r
+<p>Next, replace the following rows in those files:</p>\r
+<pre><code>&lt;repository location=&quot;http://www.simantics.org/download/master/sdk&quot;/&gt;\r
+&lt;repository location=&quot;http://www.simantics.org/download/master/external-components/maven&quot;/&gt;\r
+&lt;repository location=&quot;http://www.simantics.org/download/master/external-components/manual&quot;/&gt;\r
+</code></pre>\r
+<p>with</p>\r
+<pre><code>&lt;repository location=&quot;http://www.simantics.org/download/release/x.y.z[.w]/sdk&quot;/&gt;\r
+&lt;repository location=&quot;http://www.simantics.org/download/release/x.y.z[.w]/external-components/maven&quot;/&gt;\r
+&lt;repository location=&quot;http://www.simantics.org/download/release/x.y.z[.w]/external-components/manual&quot;/&gt;\r
 </code></pre>\r
-<ul>\r
-<li>Change <code>&lt;repository location=</code> value to <code>http://www.simantics.org/download/release/x.y.z[.w]/sdk</code></li>\r
-<li>Increment <code>sequenceNumber</code> by 1</li>\r
-</ul>\r
 </li>\r
 </ol>\r
 <h3>Initialize release branch distribution web site</h3>\r
 <ul>\r
-<li>Run the [SDK/Simantics SDK](https://www.simantics.org/jenkins/job/SDK/job/Simantics SDK) build with parameters:\r
+<li>Run <a href="https://www.simantics.org/jenkins/job/SDK/job/Deploy%20External%20Components%20to%20Web/">SDK/Deploy External Components to Web</a> build with parameters:\r
+<ul>\r
+<li><strong>GERRIT_REFNAME:</strong> <code>release/x.y.z[.w]</code></li>\r
+<li><strong>PUBLISH_ARTIFACTS:</strong> <code>true</code></li>\r
+</ul>\r
+</li>\r
+<li>Run the <a href="https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/">SDK/Simantics SDK</a> build with parameters:\r
 <ul>\r
-<li><code>REFSPEC: refs/heads/release/x.y.z[.w]</code></li>\r
-<li><code>PUBLISHED_BRANCH_NAME: release/x.y.z[.w]</code></li>\r
+<li><strong>GERRIT_REFNAME:</strong> <code>release/x.y.z[.w]</code></li>\r
+<li><strong>PUBLISH_ARTIFACTS:</strong> <code>true</code></li>\r
 </ul>\r
 </li>\r
 </ul>\r

diff --git a/releng/doc/release.md b/releng/doc/release.md
index a9a681bf22209730466fab49ca9169b33859629c..b21bbeec537a78e77cb2307eb6a20d4898ab86f9 100644 (file)
--- a/releng/doc/release.md
+++ b/releng/doc/release.md
@@ -58,26 +58,42 @@ With service releases, branch from an existing `release/*` branch instead.
        git branch release/x.y.z[.w] remotes/origin/release/x.y.z[.w]\r
        git checkout release/x.y.z[.w]\r
 \r
-2. Edit the beginning of the file `releng/org.simantics.sdk.build.targetdefinition/simantics.target`\r
+2. Edit all target platform files in  `releng/org.simantics.sdk.build.targetdefinition/`, i.e.\r
+   * `simantics.target`\r
+   * `org.simantics.sdk.build.targetdefinition.target`\r
+   * `org.simantics.sdk.build.targetdefinition-semantum.target`\r
+\r
+   At the beginning of each .target file, increment `sequenceNumber` by 1\r
    ~~~\r
    <?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
    <?pde version="3.8"?>\r
-   <target name="Simantics 1.25.0" sequenceNumber="10">\r
-   <locations>\r
-   <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">\r
-   <unit id="org.simantics.sdk.feature.group" version="1.25.0"/>\r
+   <target name="Simantics x.y.z[.w]" sequenceNumber="11">\r
+   ~~~\r
+\r
+   Next, replace the following rows in those files:   \r
+\r
+   ~~~\r
    <repository location="http://www.simantics.org/download/master/sdk"/>\r
-   </location>\r
+   <repository location="http://www.simantics.org/download/master/external-components/maven"/>\r
+   <repository location="http://www.simantics.org/download/master/external-components/manual"/>\r
    ~~~\r
 \r
-   * Change `<repository location=` value to `http://www.simantics.org/download/release/x.y.z[.w]/sdk`\r
-   * Increment `sequenceNumber` by 1\r
+   with\r
+\r
+   ~~~\r
+   <repository location="http://www.simantics.org/download/release/x.y.z[.w]/sdk"/>\r
+   <repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/maven"/>\r
+   <repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/manual"/>\r
+   ~~~\r
 \r
 ### Initialize release branch distribution web site\r
 \r
-* Run the [SDK/Simantics SDK](https://www.simantics.org/jenkins/job/SDK/job/Simantics SDK) build with parameters:\r
-  * `REFSPEC: refs/heads/release/x.y.z[.w]`\r
-  * `PUBLISHED_BRANCH_NAME: release/x.y.z[.w]`\r
+* Run [SDK/Deploy External Components to Web](https://www.simantics.org/jenkins/job/SDK/job/Deploy%20External%20Components%20to%20Web/) build with parameters:\r
+  * **GERRIT_REFNAME:** `release/x.y.z[.w]`\r
+  * **PUBLISH_ARTIFACTS:** `true`\r
+* Run the [SDK/Simantics SDK](https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/) build with parameters:\r
+  * **GERRIT_REFNAME:** `release/x.y.z[.w]`\r
+  * **PUBLISH_ARTIFACTS:** `true`\r
 \r
 ## Review documentation\r
 \r