Skip to content

Commit 85ddd5b

Browse files
authored
update SmartMDSD Toolchain sources for version 3.11 (#10)
* this Toolchain update v3.11 relates to the SmartSoft API update v1.1
1 parent 8ececc1 commit 85ddd5b

File tree

2,089 files changed

+132171
-152424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,089 files changed

+132171
-152424
lines changed

CHANGELOG

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
SmartMDSD Toolchain v3.11
2+
* Updated Welcome Pages (see Help->Welcome)
3+
* Updated C++ code geenrators to support updated background infrastructure (SmartSoft API v1.1 and ACE/SmartSoft Kernel v3.2)
4+
* Improved build performance for Toolchain Project builds (each recursive dependency is only built once now)
5+
* Added support for building ROS Mixedport components as part of the regular Toolchain build process (see also the RleaseNotes)
6+
* New experimental Modeling language for specifying non-technical Datasheet properties has been added (this language is yet likely to change and evolve in future releases)
7+
* Several internal bugfixes (not directly visible in the UI)
8+
-- Fr, 30 Nov. 2019
9+
110
SmartMDSD Toolchain v3.10
211
* Add a Universal Intro specification for the Eclipse Welcome Page (see Help->Welcome)
312
* Add new step-by-step cheatsheets for creating DomainModels, Component, and System projects

ReleaseNotes.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
This file contains the release notes for the SmartMDSD Toolchain version 3.x. For each release, it provides important information to users to support them in switching from one specific version the previous version. This includes information and instructions how to migrate content from one version to another.
44

5+
## v3.11
6+
7+
This is a maintainance release mostly motivated by the updated background infrastructure. Most notably, the **SmartSoft Component Developer API** has been updated from version 1.0 to **version 1.1**, and the **ACE/SmartSoft Kernel** has been updated from version 3.1 to **version 3.2**. Therefore the Toolchain's internal C++ code generators have been updated and now generate consistently towards the updated background infrastructure. This also means that if you have not yet updated your current background infrastructure, then you should do so **before** using this new Toolchain update.
8+
9+
As pre-announced in the previous release, the **old UI now has been deactivated** in this release. This means, that **from now on you have to use the new UI** by opening the new Eclipse perspectives introduced in the release v3.9 (see release notes below).
10+
11+
The SmartMDSD Preferences page has been revised (see the menu: **Window -> Preferences -> SmartMDSD**). Here you can now also specify the default **build type Debug/Release** which will be used to either include debug symbols into the binaries (default), or exclude it to reduce the overall footprint. Moreover, here you can select the used **ROS distribution for building ROS mixed port components**. The toolchain initially searches the default location **/opt/ros** and selects the first found distribution. In case you have more than one, here you can change the required distro. The Toolchain build process automatically sets related ROS environment variables as described here (see "4. Building projects inside Eclipse"):
12+
13+
http://wiki.ros.org/IDEs
14+
15+
Please note, the ROS build feature is rather new/experimental and might not yet work in all situations. In case it does not work, as a backup strategy, you can compile the project from within a bash terminal with the ROS setup initiated from .bashrc.
16+
17+
This release also includes a few minor usability improvements. Most notably, recursive build now works from within the Toolchain with a considerable improvement of the overall build performance: each dependency now is only built once (and not multiple times as before). While you still can build projects from a bash terminal if needed, the Toolchain build now is the recommended way.
18+
519
## v3.10
620

721
This is a minor release, mostly focusing on bugfixing and smaller usability improvements. The biggest change concerns the Plain OPC UA usage which now requires the new **[Open62541CppWrapper library](https://github.com/Servicerobotics-Ulm/Open62541CppWrapper)** to be installed. Moreover, the Welcome page has been extended with new tutorials, links and cheat-sheets (use the menu Help->Welcome, or Help->Cheat sheets...). Finally, a new context menu has been added: when right-clicking on any folder within the SmartMDSD Project Explorer, you now can open this folder directly within a Linux terminal. Other than tha, all the previous major features from the last release v3.9 remain unchanged. Please note, that the old UI (mentioned in v3.9 below) is curretly still active, however, it will be likely removed in one of the next releases, so we encourage using the new UI from now on and to update your projects as described below in the v3.9 section.

org.ecore.metamodels/org.ecore.base/org.ecore.base.basicAttributes.edit/META-INF/MANIFEST.MF

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1111
Export-Package: org.ecore.base.basicAttributes.provider
1212
Require-Bundle: org.eclipse.core.runtime,
1313
org.ecore.base.basicAttributes;visibility:=reexport,
14-
org.eclipse.emf.edit;visibility:=reexport
14+
org.eclipse.emf.edit;visibility:=reexport,
15+
org.ecore.base.documentation;visibility:=reexport,
16+
org.ecore.base.documentation.edit;visibility:=reexport
1517
Bundle-ActivationPolicy: lazy
1618
Automatic-Module-Name: org.ecore.base.basicAttributes.edit

org.ecore.metamodels/org.ecore.base/org.ecore.base.basicAttributes.edit/src-gen/org/ecore/base/basicAttributes/provider/AttributeDefinitionItemProvider.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,22 @@
1414

1515
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
1616
import org.eclipse.emf.edit.provider.IChildCreationExtender;
17-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
18-
import org.eclipse.emf.edit.provider.IItemLabelProvider;
1917
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
20-
import org.eclipse.emf.edit.provider.IItemPropertySource;
21-
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
22-
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
2318
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
24-
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
2519
import org.eclipse.emf.edit.provider.ViewerNotification;
2620

2721
import org.ecore.base.basicAttributes.AttributeDefinition;
2822
import org.ecore.base.basicAttributes.BasicAttributesFactory;
2923
import org.ecore.base.basicAttributes.BasicAttributesPackage;
24+
import org.ecore.base.documentation.provider.AbstractDocumentedElementItemProvider;
3025

3126
/**
3227
* This is the item provider adapter for a {@link org.ecore.base.basicAttributes.AttributeDefinition} object.
3328
* <!-- begin-user-doc -->
3429
* <!-- end-user-doc -->
3530
* @generated
3631
*/
37-
public class AttributeDefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
38-
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
32+
public class AttributeDefinitionItemProvider extends AbstractDocumentedElementItemProvider {
3933
/**
4034
* This constructs an instance from a factory and a notifier.
4135
* <!-- begin-user-doc -->

org.ecore.metamodels/org.ecore.base/org.ecore.base.basicAttributes.edit/src-gen/org/ecore/base/basicAttributes/provider/AttributeRefinementItemProvider.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,21 @@
1414

1515
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
1616
import org.eclipse.emf.edit.provider.IChildCreationExtender;
17-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
18-
import org.eclipse.emf.edit.provider.IItemLabelProvider;
1917
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
20-
import org.eclipse.emf.edit.provider.IItemPropertySource;
21-
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
22-
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
23-
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
2418
import org.eclipse.emf.edit.provider.ViewerNotification;
2519

2620
import org.ecore.base.basicAttributes.AttributeRefinement;
2721
import org.ecore.base.basicAttributes.BasicAttributesFactory;
2822
import org.ecore.base.basicAttributes.BasicAttributesPackage;
23+
import org.ecore.base.documentation.provider.AbstractDocumentedElementItemProvider;
2924

3025
/**
3126
* This is the item provider adapter for a {@link org.ecore.base.basicAttributes.AttributeRefinement} object.
3227
* <!-- begin-user-doc -->
3328
* <!-- end-user-doc -->
3429
* @generated
3530
*/
36-
public class AttributeRefinementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
37-
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
31+
public class AttributeRefinementItemProvider extends AbstractDocumentedElementItemProvider {
3832
/**
3933
* This constructs an instance from a factory and a notifier.
4034
* <!-- begin-user-doc -->
@@ -135,7 +129,9 @@ protected boolean shouldComposeCreationImage() {
135129
*/
136130
@Override
137131
public String getText(Object object) {
138-
return getString("_UI_AttributeRefinement_type");
132+
String label = crop(((AttributeRefinement) object).getDocumentation());
133+
return label == null || label.length() == 0 ? getString("_UI_AttributeRefinement_type")
134+
: getString("_UI_AttributeRefinement_type") + " " + label;
139135
}
140136

141137
/**

org.ecore.metamodels/org.ecore.base/org.ecore.base.basicAttributes.edit/src-gen/org/ecore/base/basicAttributes/provider/BasicAttributesEditPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.eclipse.emf.common.EMFPlugin;
66

77
import org.eclipse.emf.common.util.ResourceLocator;
8+
import org.ecore.base.documentation.provider.DocumentationEditPlugin;
89

910
/**
1011
* This is the central singleton for the BasicAttributes edit plugin.
@@ -36,7 +37,7 @@ public final class BasicAttributesEditPlugin extends EMFPlugin {
3637
* @generated
3738
*/
3839
public BasicAttributesEditPlugin() {
39-
super(new ResourceLocator[] {});
40+
super(new ResourceLocator[] { DocumentationEditPlugin.INSTANCE, });
4041
}
4142

4243
/**

org.ecore.metamodels/org.ecore.base/org.ecore.base.basicAttributes.edit/src-gen/org/ecore/base/basicAttributes/provider/BasicAttributesItemProviderAdapterFactory.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ public Adapter createEnumerationValueAdapter() {
395395
* <!-- end-user-doc -->
396396
* @generated
397397
*/
398+
@Override
398399
public ComposeableAdapterFactory getRootAdapterFactory() {
399400
return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
400401
}
@@ -405,6 +406,7 @@ public ComposeableAdapterFactory getRootAdapterFactory() {
405406
* <!-- end-user-doc -->
406407
* @generated
407408
*/
409+
@Override
408410
public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
409411
this.parentAdapterFactory = parentAdapterFactory;
410412
}
@@ -480,6 +482,7 @@ public ResourceLocator getResourceLocator() {
480482
* <!-- end-user-doc -->
481483
* @generated
482484
*/
485+
@Override
483486
public void addListener(INotifyChangedListener notifyChangedListener) {
484487
changeNotifier.addListener(notifyChangedListener);
485488
}
@@ -490,6 +493,7 @@ public void addListener(INotifyChangedListener notifyChangedListener) {
490493
* <!-- end-user-doc -->
491494
* @generated
492495
*/
496+
@Override
493497
public void removeListener(INotifyChangedListener notifyChangedListener) {
494498
changeNotifier.removeListener(notifyChangedListener);
495499
}
@@ -500,6 +504,7 @@ public void removeListener(INotifyChangedListener notifyChangedListener) {
500504
* <!-- end-user-doc -->
501505
* @generated
502506
*/
507+
@Override
503508
public void fireNotifyChanged(Notification notification) {
504509
changeNotifier.fireNotifyChanged(notification);
505510

@@ -514,6 +519,7 @@ public void fireNotifyChanged(Notification notification) {
514519
* <!-- end-user-doc -->
515520
* @generated
516521
*/
522+
@Override
517523
public void dispose() {
518524
if (attributeDefinitionItemProvider != null)
519525
attributeDefinitionItemProvider.dispose();

org.ecore.metamodels/org.ecore.base/org.ecore.base.basicAttributes/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Export-Package: org.ecore.base.basicAttributes,
1313
Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
1414
org.eclipse.core.runtime,
1515
org.eclipse.xtext.xbase.lib,
16-
org.eclipse.jface
16+
org.eclipse.jface,
17+
org.ecore.base.documentation;visibility:=reexport
1718
Bundle-ActivationPolicy: lazy
1819
Automatic-Module-Name: org.ecore.base.basicAttributes

0 commit comments

Comments
 (0)