Bug 571869 - [Designer][release] Release version 2.0.0 of Papyrus SW designer
- Fix product definition:
- Only use Papyprus SDK feature instead of sub-features
- Use "installRoot" options for Papyrus and designer features
- Update installation instruction in documentation page
- Add a dependency to IDL in component feature.
Change-Id: I54b21d0efbf6afd2ca2cda2a644f2840752e3fcd
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/features/org.eclipse.papyrus.designer.components.main.feature/feature.xml b/features/org.eclipse.papyrus.designer.components.main.feature/feature.xml
index 6aaa50d..37a1356 100644
--- a/features/org.eclipse.papyrus.designer.components.main.feature/feature.xml
+++ b/features/org.eclipse.papyrus.designer.components.main.feature/feature.xml
@@ -22,7 +22,7 @@
model
</description>
- <copyright url="https://www.eclipse.org/legal/epl-2.0/">
+ <copyright url="https://www.eclipse.org/legal/epl-2.0/">
Copyright (c) CEA LIST
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License
@@ -39,6 +39,7 @@
<import feature="org.eclipse.papyrus.designer.languages.cpp.feature"/>
<import feature="org.eclipse.papyrus.designer.languages.java.feature"/>
<import feature="org.eclipse.papyrus.designer.transformation.main.feature"/>
+ <import plugin="org.eclipse.papyrus.designer.languages.idl.library"/>
</requires>
<plugin
diff --git a/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/getting-started.mediawiki b/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/getting-started.mediawiki
index 7a6a0a7..e46eb70 100644
--- a/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/getting-started.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.designer.doc.main/src/site/mediawiki/userdoc/getting-started.mediawiki
@@ -1,14 +1,14 @@
== Installation instructions ==
-Papyrus Designer is an extension of the Papyrus modeler. In order to install it, there are three different methods
+Papyrus Designer is an extension of the Papyrus modeler. In order to install it, there are three different methods (CAVEAT: currently only the nightly update site are working properly with a Papyrus 2020-12 or newer, for 2020-06 the associated nightly update site is recommended as it contains several bug fixes and enhancements that are not yet in the release)
-1. The easiest way (if Papyrus is not already installed) is to install the Papyrus SW designer RCP available [http://download.eclipse.org/modeling/mdt/papyrus/components/designer/downloads/oxygen/rcps/?d here].
+1. The easiest way (if Papyrus is not already installed) is to install the Papyrus SW designer RCP [https://download.eclipse.org/modeling/mdt/papyrus/components/designer/downloads/2021-03/products/]. Nightly RCPs for Eclipse 2021-03, are available as well [https://ci.eclipse.org/papyrus/job/papyrus-designer-2021-03/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.product/target/products/].
-2. Install Papyrus Software designer via the Eclipse market place.
+2. Install Papyrus Software designer via the [https://marketplace.eclipse.org/content/papyrus-software-designer market place]].
3. Open the standard Eclipse installation dialog (Help->Install New Software).
-Within, select its update site: [http://download.eclipse.org/modeling/mdt/papyrus/components/designer/ http://download.eclipse.org/modeling/mdt/papyrus/components/designer/].
+Within, add either the release update site of SW designer: [https://download.eclipse.org/modeling/mdt/papyrus/components/designer/ https://download.eclipse.org/modeling/mdt/papyrus/components/designer/] or a nightly build [https://ci.eclipse.org/papyrus/job/papyrus-designer-2020-06/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/], [https://ci.eclipse.org/papyrus/job/papyrus-designer-2021-03/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/].
== Provided Examples ==
-A good starting point for Papyrus Designer are example models enriches with comments. These examples are available via File->New->Example, category "Papyrus" examples.
+A good starting point for Papyrus Designer are example models containing comments. These examples are available via File->New->Example, category "Papyrus" examples.
diff --git a/plugins/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.examples/models/examples/HelloWorldOO/HelloWorldOO.di b/plugins/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.examples/models/examples/HelloWorldOO/HelloWorldOO.di
index b61e898..bf9abab 100644
--- a/plugins/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.examples/models/examples/HelloWorldOO/HelloWorldOO.di
+++ b/plugins/languages/cpp/org.eclipse.papyrus.designer.languages.cpp.examples/models/examples/HelloWorldOO/HelloWorldOO.di
@@ -1,21 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_M_WAwPcXEd-KM6l7lmIPkw">
- <pageList xmi:id="_M_WAwfcXEd-KM6l7lmIPkw">
- <availablePage xmi:id="_M_WAwvcXEd-KM6l7lmIPkw"/>
- <availablePage xmi:id="_M_WAxPcXEd-KM6l7lmIPkw"/>
- <availablePage xmi:id="_M_WAxfcXEd-KM6l7lmIPkw"/>
- <availablePage xmi:id="_U1docPcXEd-KM6l7lmIPkw"/>
- <availablePage xmi:id="_V5fVYP8nEd-hWJO6cv3VJA"/>
- <availablePage/>
- <availablePage/>
- </pageList>
- <sashModel xmi:id="_M_WAxvcXEd-KM6l7lmIPkw" currentSelection="_M_WAyPcXEd-KM6l7lmIPkw">
- <windows xmi:id="_M_WAx_cXEd-KM6l7lmIPkw">
- <children xsi:type="di:TabFolder" xmi:id="_M_WAyPcXEd-KM6l7lmIPkw">
- <children>
- <emfPageIdentifier href="HelloWorldOO.notation#_4fWAcMpkEeOpmd7vWBVZJQ"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
index b904a11..1d20d05 100644
--- a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
+++ b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
@@ -184,39 +184,10 @@
<features>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
- <feature id="org.eclipse.papyrus.designer.feature"/>
- <feature id="org.eclipse.papyrus.designer.rcp.feature"/>
- <feature id="org.eclipse.rcp"/>
- <feature id="org.eclipse.papyrus.editor.feature"/>
- <feature id="org.eclipse.papyrus.infra.architecture.feature"/>
- <feature id="org.eclipse.papyrus.infra.core.feature"/>
- <feature id="org.eclipse.papyrus.infra.feature"/>
- <feature id="org.eclipse.papyrus.infra.gmfdiag.feature"/>
- <feature id="org.eclipse.papyrus.infra.services.feature"/>
- <feature id="org.eclipse.papyrus.infra.widget.feature"/>
- <feature id="org.eclipse.papyrus.uml.feature"/>
- <feature id="org.eclipse.papyrus.uml.modelexplorer.feature"/>
- <feature id="org.eclipse.papyrus.uml.properties.feature"/>
- <feature id="org.eclipse.papyrus.uml.tools.feature"/>
- <feature id="org.eclipse.papyrus.views.modelexplorer.feature"/>
- <feature id="org.eclipse.papyrus.views.properties.feature"/>
- <feature id="org.eclipse.papyrus.uml.diagram.feature"/>
- <feature id="org.eclipse.papyrus.infra.emf.feature"/>
- <feature id="org.eclipse.papyrus.uml.textedit.feature"/>
- <feature id="org.eclipse.papyrus.uml.alf.feature"/>
- <feature id="org.eclipse.papyrus.views.validation.feature"/>
- <feature id="org.eclipse.papyrus.doc.feature"/>
- <feature id="org.eclipse.papyrus.views.search.feature"/>
- <feature id="org.eclipse.papyrus.uml.search.feature"/>
- <feature id="org.eclipse.papyrus.uml.xtext.integration.feature"/>
- <feature id="org.eclipse.papyrus.infra.nattable.feature"/>
- <feature id="org.eclipse.papyrus.uml.nattable.feature"/>
- <feature id="org.eclipse.papyrus.infra.gmfdiag.css.feature"/>
- <feature id="org.eclipse.papyrus.uml.diagram.css.feature"/>
- <feature id="org.eclipse.papyrus.emf.facet.feature"/>
- <feature id="org.eclipse.papyrus.infra.viewpoints.feature"/>
- <feature id="org.eclipse.papyrus.uml.decoratormodel.feature"/>
- <feature id="org.eclipse.papyrus.uml.architecture.feature"/>
+ <feature id="org.eclipse.jdt"/>
+ <feature id="org.eclipse.papyrus.sdk.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.rcp.feature" installMode="root"/>
</features>
<configurations>
