Merge "(refs #7508) Added missing effects in the simplification of EBind"
authorHannu Niemistö <hannu.niemisto@semantum.fi>
Wed, 4 Oct 2017 19:42:19 +0000 (22:42 +0300)
committerGerrit Code Review <gerrit2@www.simantics.org>
Wed, 4 Oct 2017 19:42:19 +0000 (22:42 +0300)
bundles/org.simantics.browsing.ui.swt/src/org/simantics/browsing/ui/swt/widgets/Button.java
bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ConnectionVisuals.java
bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/chart/property/BooleanPropertyFactory.java
bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/diagramEditor/PopulateElementDropParticipant.java
bundles/org.simantics.scl.rest/scl/Server/RESTSCL.scl [moved from bundles/org.simantics.scl.rest/scl/SCL/REST/Server.scl with 100% similarity]
bundles/org.simantics.scl.rest/src/org/simantics/scl/rest/SCLRESTServer.java
features/org.simantics.desktop.product.feature/feature.xml
features/org.simantics.scl.rest.feature/feature.xml
releng/doc/release.html
releng/doc/release.md

index 8dc5feab0b90bf5f1c9227e91f2934528cab8fe7..a3194e7b4d7fe0332b72c77bd7ea706b036e6901 100644 (file)
@@ -90,29 +90,19 @@ public class Button extends WidgetImpl {
 
                 @Override
                 public void exception(final Throwable t) {
-                    SWTUtils.asyncExec(button, new Runnable() {
-
-                        @Override
-                        public void run() {
-                            if(isDisposed()) return;
-//                            System.out.println("Button received new text: " + text);
-                            button.setText(t.toString());
-                        }
-
+                    SWTUtils.asyncExec(button, () -> {
+                        if(isDisposed()) return;
+//                        System.out.println("Button received new text: " + text);
+                        button.setText(t.toString());
                     });
                 }
 
                 @Override
                 public void execute(final String text) {
-                    SWTUtils.asyncExec(button, new Runnable() {
-
-                        @Override
-                        public void run() {
-                            if(isDisposed()) return;
-//                            System.out.println("Button received new text: " + text);
-                            button.setText(text);
-                        }
-
+                    SWTUtils.asyncExec(button, () -> {
+                        if(isDisposed()) return;
+//                        System.out.println("Button received new text: " + text);
+                        button.setText(text);
                     });
                 }
 
@@ -134,15 +124,10 @@ public class Button extends WidgetImpl {
 
                 @Override
                 public void execute(final String text) {
-                    SWTUtils.asyncExec(button, new Runnable() {
-
-                        @Override
-                        public void run() {
-                            if(isDisposed()) return;
-//                            System.out.println("Button received new tooltip: " + text);
-                            button.setToolTipText(text);
-                        }
-
+                    SWTUtils.asyncExec(button, () -> {
+                        if(isDisposed()) return;
+//                        System.out.println("Button received new tooltip: " + text);
+                        button.setToolTipText(text);
                     });
                 }
 
@@ -164,24 +149,17 @@ public class Button extends WidgetImpl {
 
                 @Override
                 public void execute(final ImageDescriptor imageDescriptor) {
-                    SWTUtils.asyncExec(button, new Runnable() {
-
-                        @Override
-                        public void run() {
-
-                            if(isDisposed()) return;
-//                            System.out.println("Button received new image");
-                            ResourceManager rm = support.getParameter(WidgetSupport.RESOURCE_MANAGER);
-                            if (rm != null) {
-                                Image image = (Image) rm.get(imageDescriptor);
-                                button.setImage(image);
-                            }
-                            // TODO: how can we resize without this knife??
-                            button.getParent().layout();
-                            button.getParent().getParent().layout();
-
+                    SWTUtils.asyncExec(button, () -> {
+                        if(isDisposed()) return;
+//                        System.out.println("Button received new image");
+                        ResourceManager rm = support.getParameter(WidgetSupport.RESOURCE_MANAGER);
+                        if (rm != null) {
+                            Image image = (Image) rm.get(imageDescriptor);
+                            button.setImage(image);
                         }
-
+                        // TODO: how can we resize without this knife??
+                        button.getParent().layout();
+                        button.getParent().getParent().layout();
                     });
                 }
 
@@ -201,12 +179,9 @@ public class Button extends WidgetImpl {
                 }
                 @Override
                 public void execute(final Boolean selected) {
-                    SWTUtils.asyncExec(button, new Runnable() {
-                        @Override
-                        public void run() {
-                            if(isDisposed()) return;
-                            button.setSelection(selected);
-                        }
+                    SWTUtils.asyncExec(button, () -> {
+                        if(isDisposed()) return;
+                        button.setSelection(Boolean.TRUE.equals(selected));
                     });
                 }
                 @Override
@@ -222,46 +197,34 @@ public class Button extends WidgetImpl {
     }
 
     public <T> void setText(final ParametrizedRead<T, String> read) {
-               
-       Simantics.getSession().async(new UniqueRead<String>() {
-
-               @Override
-               public String perform(ReadGraph graph) throws DatabaseException {
-                       T input = support.getInput(graph);
-                       return graph.syncRequest(read.get(input));
-               }
-
-       }, new Listener<String>() {
-
-               @Override
-               public void exception(Throwable t) {
-                       t.printStackTrace();
-               }
-
-               @Override
-               public void execute(final String text) {
-
-                       if(isDisposed()) return;
-
-                       button.getDisplay().asyncExec(new Runnable() {
-
-                               @Override
-                               public void run() {
-                                       button.setText(text);
-                               }
-
-                       });
-               }
-
-               @Override
-               public boolean isDisposed() {
-                       return button.isDisposed();
-               }
+        Simantics.getSession().async(new UniqueRead<String>() {
+            @Override
+            public String perform(ReadGraph graph) throws DatabaseException {
+                T input = support.getInput(graph);
+                return graph.syncRequest(read.get(input));
+            }
+        }, new Listener<String>() {
+            @Override
+            public void exception(Throwable t) {
+                ErrorLogger.defaultLogError(t);
+            }
 
-       });
+            @Override
+            public void execute(final String text) {
+                if(isDisposed()) return;
+                button.getDisplay().asyncExec(() -> {
+                    if(isDisposed()) return;
+                    button.setText(text);
+                });
+            }
 
+            @Override
+            public boolean isDisposed() {
+                return button.isDisposed();
+            }
+        });
     }
-    
+
     public void setTooltipText(String text) {
         button.setToolTipText(text);
     }
index 5f62ac31469798b15ac2d95ec2712a75b108bcc2..802881e1610efa52d787e0670edddb4c291e45de 100644 (file)
@@ -28,6 +28,10 @@ public class ConnectionVisuals {
     public final Double branchPointRadius;
     public final Double rounding;
 
+    public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double rounding) {
+       this(color, strokeType, stroke, null, rounding);
+    }
+
     public ConnectionVisuals(float[] color, StrokeType strokeType, Stroke stroke, Double branchPointRadius, Double rounding) {
         if (color != null && color.length < 3)
             throw new IllegalArgumentException("colors must have at least 3 components (rgb), got " + color.length);
index 14dc51c1d24d9451a31ccf6121943027127dce73..8efe2668a6980aa0bb42645597ee364836e343b8 100644 (file)
@@ -36,7 +36,7 @@ public class BooleanPropertyFactory extends ReadFactoryImpl<Resource, Boolean> {
 
     @Override
     public Boolean perform(ReadGraph graph, Resource r) throws DatabaseException {
-        return graph.getPossibleRelatedValue2(r, graph.getResource(propertyURI), Bindings.BOOLEAN);
+        return Boolean.TRUE.equals( graph.getPossibleRelatedValue2(r, graph.getResource(propertyURI), Bindings.BOOLEAN) );
     }
 
 }
index 3b6da0b5bd69b4d683bcfc5fbe995031908cf02a..4f27406025f752cd713b5dcc77cab0a5a2a2a6e0 100644 (file)
@@ -159,10 +159,10 @@ public class PopulateElementDropParticipant extends AbstractDiagramParticipant i
                                     }
 
                                     try {
-                                        String valid = validateDrop(synchronizer.getSession(), r,
+                                        Object errorOrSymbolResource = validateDrop(synchronizer.getSession(), r,
                                                 diagram.<Resource> getHint(DiagramModelHints.KEY_DIAGRAM_RESOURCE));
-                                        if (valid == null) {
-                                            ElementClassDragItem item = new ElementClassDragItem(synchronizer.getNodeClass(r));
+                                        if (errorOrSymbolResource instanceof Resource) {
+                                            ElementClassDragItem item = new ElementClassDragItem(synchronizer.getNodeClass((Resource)errorOrSymbolResource));
                                             item.getHintContext().setHint(ElementHints.KEY_TRANSFORM, AffineTransform.getScaleInstance(1, 1));
                                             dp.add(item);
                                         }
@@ -207,10 +207,10 @@ public class PopulateElementDropParticipant extends AbstractDiagramParticipant i
         }
     }
 
-    private String validateDrop(RequestProcessor processor, final Resource draggedResource, final Resource dropTarget) throws DatabaseException {
-        return processor.syncRequest(new UniqueRead<String>() {
+    private Object validateDrop(RequestProcessor processor, final Resource draggedResource, final Resource dropTarget) throws DatabaseException {
+        return processor.syncRequest(new UniqueRead<Object>() {
             @Override
-            public String perform(ReadGraph graph) throws DatabaseException {
+            public Object perform(ReadGraph graph) throws DatabaseException {
 //                System.out.println("dragged resource: " + draggedResource);
 //                System.out.println("drop target resource: " + dropTarget);
                 Resource sourceModel = graph.syncRequest(new PossibleIndexRoot(draggedResource));
@@ -240,18 +240,28 @@ public class PopulateElementDropParticipant extends AbstractDiagramParticipant i
                     }
                 }
 
+                // Check if dragged object is symbol or component type and determine other
+                Resource componentType;
+                Resource symbol = graph.getPossibleObject(draggedResource, MOD.ComponentTypeToSymbol);
+                
+                if(symbol != null)
+                    componentType = draggedResource;
+                else {
+                    componentType = graph.getPossibleObject(draggedResource, MOD.SymbolToComponentType);
+                    symbol = draggedResource;
+                }
+                
                 // Prevent dragging a symbol of component type into its own configuration.
-                Resource componentTypeFromSymbol = graph.getPossibleObject(draggedResource, MOD.SymbolToComponentType);
-                if (componentTypeFromSymbol != null) {
+                if (componentType != null) {
                     if (configuration != null) {
                         Resource componentTypeFromDiagram = graph.getPossibleObject(configuration, STR.Defines);
-                        if (componentTypeFromDiagram != null && componentTypeFromSymbol.equals(componentTypeFromDiagram)) {
+                        if (componentTypeFromDiagram != null && componentType.equals(componentTypeFromDiagram)) {
                             return "Cannot instantiate user component within its own configuration.";
                         }
                     }
                 }
 
-                return null;
+                return symbol;
             }
         });
     }
index 0e642026ea39ef953b52036a2116aa0092f49712..b7e8090b506fd05036e8c60346aaeadc2d1e7050 100644 (file)
@@ -36,7 +36,6 @@ public class SCLRESTServer {
         server = new Server();
         ServerConnector connector = new ServerConnector(server);
         connector.setPort(preferablePort);
-        connector.setHost("localhost");
         
         server.setConnectors(new Connector[] { connector });
         
index 9bd6f1eda661db7ee46421d7914ad21322f29b5a..59c22464375383ef51b34e2c4080e9c80a8b8937 100644 (file)
          id="org.simantics.modeling.ui.workbench.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.simantics.scl.rest.feature"
+         version="0.0.0"/>
+
    <plugin
          id="org.simantics.desktop.product"
          download-size="0"
index 4c963457817131119f3815932931b376f0392cf5..72371382e5d8c7419072486839acc3d239778e28 100644 (file)
@@ -228,4 +228,102 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.glassfish.jersey.bundles.repackaged.jersey-guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.validation.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.external.aopalliance-repackaged"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.osgi-resource-locator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.hk2.utils"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.core.jersey-common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.ext.jersey-entity-filtering"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.glassfish.jersey.core.jersey-client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javassist"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
index aaccfc9152e0da5fdae61f9e56275cee47dac70e..ebe85ee67cb86e68d53ae6eba18c0f471923dd1f 100644 (file)
@@ -320,19 +320,28 @@ img {
 </ul>\r
 <hr />\r
 <h1>Released Plug-in Components and Products</h1>\r
-<p>There are both plug-in components and products that are part of the &quot;Simantics release train&quot; that shall be released simultaneously to a major or minor Simantics release.</p>\r
+<p>There are both plug-in components and products that are part of the <em>Simantics Release Train</em> that shall be released simultaneously to a major or minor Simantics release.</p>\r
 <p>Plug-in components are installable features that are deployed online as P2 repositories for general availability. Products are deployed as ZIP files and made available online in designated locations on simantics.org.</p>\r
-<p>Products that are part of the release train:</p>\r
-<ul>\r
-<li>Simantics Desktop</li>\r
-<li>Simantics System Dynamics Tool - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/sysdyn.git;a=summary">simantics/sysdyn.git</a></li>\r
-</ul>\r
 <p>Plug-in components that are part of the release train:</p>\r
 <ul>\r
-<li>Simantics R - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/r.git;a=summary">simantics/r.git</a></li>\r
+<li>Simupedia - <a href="https://www.simantics.org:8088/r/gitweb?p=members/simupedia.git;a=summary">members/simupedia.git</a></li>\r
 <li>FMIL - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/fmil.git;a=summary">simantics/fmil.git</a></li>\r
 <li>FMI Studio - <a href="https://www.simantics.org:8088/r/gitweb?p=members/fmi.git;a=summary">members/fmi.git</a></li>\r
-<li>Simupedia - <a href="https://www.simantics.org:8088/r/gitweb?p=members/simupedia.git;a=summary">members/simupedia.git</a></li>\r
+<li>Interoperability components - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/interop.git;a=summary">simantics/interop.git</a></li>\r
+<li>Simantics R binding - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/r.git;a=summary">simantics/r.git</a></li>\r
+<li>Matlab SCL binding - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/matlab.git;a=summary">simantics/matlab.git</a></li>\r
+<li>Python SCL binding - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/python.git;a=summary">simantics/python.git</a></li>\r
+<li>Simantics System Dynamics - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/sysdyn.git;a=summary">simantics/sysdyn.git</a></li>\r
+<li>Simantics District modelling components - <a href="https://www.simantics.org:8088/r/gitweb?p=simantics/district.git;a=summary">simantics/district.git</a></li>\r
+</ul>\r
+<p>Products that are part of the release train:</p>\r
+<ul>\r
+<li>Simantics Desktop</li>\r
+<li>Simantics System Dynamics Tool\r
+<ul>\r
+<li>This is Simantics Desktop with Simantics System Dynamics Tool features installed</li>\r
+</ul>\r
+</li>\r
 </ul>\r
 <p>For simplicity, each of these components are versioned accoring to platform versioning, i.e. for Platform SDK 1.26.0 there will be Simantics Desktop 1.26.0, Sysdyn 1.26.0, and so on.</p>\r
 <hr />\r
@@ -359,7 +368,9 @@ git push origin release/x.y.z[.w]
 <p>When creating major/minor releases <code>&lt;commit&gt;</code> is usually a commit in the <code>master</code> branch.\r
 With service releases, branch from an existing <code>release/*</code> branch instead.</p>\r
 <h2>Prepare release branch for use</h2>\r
-<h3>Prepare .target files</h3>\r
+<p>In release 1.31.0 Simantics started using uses the wonderful tool from Obeo (<a href="https://github.com/mbarbero/fr.obeo.releng.targetplatform">https://github.com/mbarbero/fr.obeo.releng.targetplatform</a>) to generate <code>.target</code> files from <code>.tpd</code> files which allow much simpler specification of the target contents and also composition of .tpd files via inclusion.</p>\r
+<p>In the following steps, it is recommended to ensure every <code>.target</code> file is up-to-date by regenerating them from <code>.tpd</code> files. While doing so, take care to use up-to-date online contents to perform the generation.</p>\r
+<h3>Prepare <code>.tpd</code> files</h3>\r
 <ol>\r
 <li>\r
 <p>Retrieve release branch of the platform repository</p>\r
@@ -370,29 +381,22 @@ git checkout release/x.y.z[.w]
 </code></pre>\r
 </li>\r
 <li>\r
-<p>Edit all target platform files in  <code>releng/org.simantics.sdk.build.targetdefinition/</code>, i.e.</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.tpd</code></li>\r
+<li><code>simantics.tpd</code></li>\r
 </ul>\r
-<p>At the beginning of simantics.target file, increment <code>sequenceNumber</code> by 1 and replace\r
-the version numbers in target name and <code>org.simantics.sdk.feature.group</code> and\r
-<code>org.simantics.sdk.source.feature.group</code> with <code>x.y.z[.w]</code>:</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 x.y.z[.w]&quot; sequenceNumber=&quot;11&quot;&gt;\r
-&lt;unit id=&quot;org.simantics.sdk.feature.group&quot; version=&quot;x.y.z[.w]&quot;/&gt;\r
-&lt;unit id=&quot;org.simantics.sdk.source.feature.group&quot; version=&quot;x.y.z[.w]&quot;/&gt;\r
-</code></pre>\r
-<p>Next, replace the following rows in both mentioned 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
+<p>Replace the following rows in both mentioned files:</p>\r
+<pre><code>location &quot;http://www.simantics.org/download/master/external-components/maven&quot; {\r
+location &quot;http://www.simantics.org/download/master/external-components/manual&quot; {\r
+include &quot;http://www.simantics.org/download/master/org.simantics.sdk.build.targetdefinition.tpd&quot;\r
+location &quot;http://www.simantics.org/download/master/sdk&quot; {\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
+<pre><code>location &quot;http://www.simantics.org/download/master/release/x.y.z[.w]/maven&quot; {\r
+location &quot;http://www.simantics.org/download/master/release/x.y.z[.w]/manual&quot; {\r
+include &quot;http://www.simantics.org/download/release/x.y.z[.w]/org.simantics.sdk.build.targetdefinition.tpd&quot;\r
+location &quot;http://www.simantics.org/download/release/x.y.z[.w]/sdk&quot; {\r
 </code></pre>\r
 </li>\r
 <li>\r
@@ -426,6 +430,7 @@ the version numbers in target name and <code>org.simantics.sdk.feature.group</co
 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>\r
 <p>Commit the changes with the following commit message</p>\r
 <pre><code>Bumped master target and org.simantics.sdk feature versions to x.y.z[.w].\r
+\r
 refs #yyyy\r
 </code></pre>\r
 <p>where <code>#yyyy</code> is the number of the next release's release engineering issue.</p>\r
@@ -449,6 +454,20 @@ refs #yyyy
 <p>Running these two builds will ensure that both the external components required to build the SDK and the Simantics SDK for the new release branch are published online at <code>http://www.simantics.org/download/release/x.y.z[.w]/</code>.</p>\r
 <p>After this, whenever changes are pushed/merged to <code>release/x.y.z[.w]</code> branch in Gerrit, new <strong>SDK/Simantics SDK</strong> builds are triggered automatically and they will publish the results at the same location online.</p>\r
 <p>This means that one does not have to do any tricks after this to build and publish the SDK as a P2 repository online. It is an automated process that is performed by the <a href="https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/">SDK/Simantics SDK</a> Jenkins job.</p>\r
+<h3>Update <code>.target</code> files</h3>\r
+<p>Lastly, we want to change the <code>.target</code> files to point to the correct P2 repository locations. This happens by opening the previously edited <code>.tpd</code> files in Obeo's editor and regenerating the <code>.target</code> files by pressing Alt+R.</p>\r
+<p>Push the changed files to remote again with commit message:</p>\r
+<pre><code>Configured release/x.y.z[.w] branch .target files.\r
+\r
+refs #xxxx\r
+</code></pre>\r
+<h3>Test Release Train build</h3>\r
+<p>Trigger an execution of the <a href="https://www.simantics.org/jenkins/job/simantics-release-train/">simantics-release-train</a> Jenkins job with parameters</p>\r
+<ul>\r
+<li>GERRIT_REFNAME: <code>release/x.y.z[.w]</code></li>\r
+<li>PUBLISH_ARTIFACTS: <code>true</code></li>\r
+</ul>\r
+<p>to ensure that all components of the release train build fine and to publish first versions of P2 repositories of everything online.</p>\r
 <h2>Review documentation</h2>\r
 <p>Documentation to review:</p>\r
 <ul>\r
@@ -583,16 +602,6 @@ Insert some general thoughts on the release...
 <hr />\r
 <h1>TODO</h1>\r
 <ul>\r
-<li>Start using <a href="https://github.com/mbarbero/fr.obeo.releng.targetplatform">https://github.com/mbarbero/fr.obeo.releng.targetplatform</a> to generate <code>.target</code> files. <code>.tpd</code> files allow specifying version ranges instead of specific versions.</li>\r
-</ul>\r
-<ul>\r
-<li>Create a parametrized release train pipeline build in Jenkins that creates all artifacts of a simantics release\r
-<ul>\r
-<li>Desktop, Sysdyn, R, Simupedia, FMIL, FMI Studio</li>\r
-</ul>\r
-</li>\r
-</ul>\r
-<ul>\r
 <li>Incorporate tutorial code in the platform repository as a separate folder to allow platform builds to directly ensure that the tutorial code still builds OK</li>\r
 </ul>\r
 \r
index 871b1d0aa3eb0b56069ee1be66033d91bdec3b03..3f4d69bfae3222248afa0446d6040239f09286f9 100644 (file)
 
 # Released Plug-in Components and Products
 
-There are both plug-in components and products that are part of the "Simantics release train" that shall be released simultaneously to a major or minor Simantics release.
+There are both plug-in components and products that are part of the _Simantics Release Train_ that shall be released simultaneously to a major or minor Simantics release.
 
 Plug-in components are installable features that are deployed online as P2 repositories for general availability. Products are deployed as ZIP files and made available online in designated locations on simantics.org.
 
-Products that are part of the release train:
-* Simantics Desktop
-* Simantics System Dynamics Tool - [simantics/sysdyn.git](https://www.simantics.org:8088/r/gitweb?p=simantics/sysdyn.git;a=summary)
-
 Plug-in components that are part of the release train:
-* Simantics R - [simantics/r.git](https://www.simantics.org:8088/r/gitweb?p=simantics/r.git;a=summary)
+* Simupedia - [members/simupedia.git](https://www.simantics.org:8088/r/gitweb?p=members/simupedia.git;a=summary)
 * FMIL - [simantics/fmil.git](https://www.simantics.org:8088/r/gitweb?p=simantics/fmil.git;a=summary)
 * FMI Studio - [members/fmi.git](https://www.simantics.org:8088/r/gitweb?p=members/fmi.git;a=summary)
-* Simupedia - [members/simupedia.git](https://www.simantics.org:8088/r/gitweb?p=members/simupedia.git;a=summary)
+* Interoperability components - [simantics/interop.git](https://www.simantics.org:8088/r/gitweb?p=simantics/interop.git;a=summary)
+* Simantics R binding - [simantics/r.git](https://www.simantics.org:8088/r/gitweb?p=simantics/r.git;a=summary)
+* Matlab SCL binding - [simantics/matlab.git](https://www.simantics.org:8088/r/gitweb?p=simantics/matlab.git;a=summary)
+* Python SCL binding - [simantics/python.git](https://www.simantics.org:8088/r/gitweb?p=simantics/python.git;a=summary)
+* Simantics System Dynamics - [simantics/sysdyn.git](https://www.simantics.org:8088/r/gitweb?p=simantics/sysdyn.git;a=summary)
+* Simantics District modelling components - [simantics/district.git](https://www.simantics.org:8088/r/gitweb?p=simantics/district.git;a=summary)
+
+Products that are part of the release train:
+* Simantics Desktop
+* Simantics System Dynamics Tool \r
+  * This is Simantics Desktop with Simantics System Dynamics Tool features installed
 
 For simplicity, each of these components are versioned accoring to platform versioning, i.e. for Platform SDK 1.26.0 there will be Simantics Desktop 1.26.0, Sysdyn 1.26.0, and so on.
 
@@ -71,7 +77,11 @@ With service releases, branch from an existing `release/*` branch instead.
 
 ## Prepare release branch for use
 
-### Prepare .target files
+In release 1.31.0 Simantics started using uses the wonderful tool from Obeo ([https://github.com/mbarbero/fr.obeo.releng.targetplatform](https://github.com/mbarbero/fr.obeo.releng.targetplatform)) to generate `.target` files from `.tpd` files which allow much simpler specification of the target contents and also composition of .tpd files via inclusion.
+
+In the following steps, it is recommended to ensure every `.target` file is up-to-date by regenerating them from `.tpd` files. While doing so, take care to use up-to-date online contents to perform the generation.
+
+### Prepare `.tpd` files
 
 1. Retrieve release branch of the platform repository
 
@@ -80,35 +90,26 @@ With service releases, branch from an existing `release/*` branch instead.
        git branch release/x.y.z[.w] remotes/origin/release/x.y.z[.w]
        git checkout release/x.y.z[.w]
 
-2. Edit all target platform files in  `releng/org.simantics.sdk.build.targetdefinition/`, i.e.
-   * `simantics.target`
-   * `org.simantics.sdk.build.targetdefinition.target`
-
-   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]"/>
-   ~~~
+2. Edit all target platform files in `releng/org.simantics.sdk.build.targetdefinition/`, i.e.
+   * `org.simantics.sdk.build.targetdefinition.tpd`
+   * `simantics.tpd`
 
-   Next, replace the following rows in both mentioned files:
+   Replace the following rows in both mentioned files:
 
    ~~~
-   <repository location="http://www.simantics.org/download/master/sdk"/>
-   <repository location="http://www.simantics.org/download/master/external-components/maven"/>
-   <repository location="http://www.simantics.org/download/master/external-components/manual"/>
+   location "http://www.simantics.org/download/master/external-components/maven" {
+   location "http://www.simantics.org/download/master/external-components/manual" {
+   include "http://www.simantics.org/download/master/org.simantics.sdk.build.targetdefinition.tpd"
+   location "http://www.simantics.org/download/master/sdk" {
    ~~~
 
    with
 
    ~~~
-   <repository location="http://www.simantics.org/download/release/x.y.z[.w]/sdk"/>
-   <repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/maven"/>
-   <repository location="http://www.simantics.org/download/release/x.y.z[.w]/external-components/manual"/>
+   location "http://www.simantics.org/download/master/release/x.y.z[.w]/maven" {
+   location "http://www.simantics.org/download/master/release/x.y.z[.w]/manual" {
+   include "http://www.simantics.org/download/release/x.y.z[.w]/org.simantics.sdk.build.targetdefinition.tpd"
+   location "http://www.simantics.org/download/release/x.y.z[.w]/sdk" {
    ~~~
 
 3. Edit version number of `org.simantics.sdk` feature in `features/org.simantics.sdk.feature/feature.xml` to `x.y.z[.w]`.
@@ -144,6 +145,7 @@ With service releases, branch from an existing `release/*` branch instead.
    Commit the changes with the following commit message
 
        Bumped master target and org.simantics.sdk feature versions to x.y.z[.w].
+
        refs #yyyy
 
    where `#yyyy` is the number of the next release's release engineering issue.
@@ -163,6 +165,24 @@ After this, whenever changes are pushed/merged to `release/x.y.z[.w]` branch in
 
 This means that one does not have to do any tricks after this to build and publish the SDK as a P2 repository online. It is an automated process that is performed by the [SDK/Simantics SDK](https://www.simantics.org/jenkins/job/SDK/job/Simantics%20SDK/) Jenkins job.
 
+### Update `.target` files
+
+Lastly, we want to change the `.target` files to point to the correct P2 repository locations. This happens by opening the previously edited `.tpd` files in Obeo's editor and regenerating the `.target` files by pressing Alt+R.
+
+Push the changed files to remote again with commit message:
+
+    Configured release/x.y.z[.w] branch .target files.
+
+    refs #xxxx
+
+### Test Release Train build
+
+Trigger an execution of the [simantics-release-train](https://www.simantics.org/jenkins/job/simantics-release-train/) Jenkins job with parameters
+* GERRIT_REFNAME: `release/x.y.z[.w]`\r
+* PUBLISH_ARTIFACTS: `true`\r
+
+to ensure that all components of the release train build fine and to publish first versions of P2 repositories of everything online.
+
 ## Review documentation
 
 Documentation to review:
@@ -278,11 +298,4 @@ Insert some general thoughts on the release...
 
 # TODO
 
-* Start using [https://github.com/mbarbero/fr.obeo.releng.targetplatform](https://github.com/mbarbero/fr.obeo.releng.targetplatform) to generate `.target` files. `.tpd` files allow specifying version ranges instead of specific versions.
-
-
-* Create a parametrized release train pipeline build in Jenkins that creates all artifacts of a simantics release
-  * Desktop, Sysdyn, R, Simupedia, FMIL, FMI Studio
-
-
 * Incorporate tutorial code in the platform repository as a separate folder to allow platform builds to directly ensure that the tutorial code still builds OK
\ No newline at end of file