Bug 571869 - [Designer][release] Release version 2.0.0 of Papyrus SW designer
- Fix some references in index.html (of update site)
- Add p2.inf file => update sites in RCP
- Use tar.gz for Linux RCP
- Remove deprecated MaxPermSize from options
- Remove UCM from RCP (of course, it can be installed later)
Change-Id: I321f0078b9b7e660a06bebf352a35020eeed6db3
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/features/org.eclipse.papyrus.designer.feature/feature.xml b/features/org.eclipse.papyrus.designer.feature/feature.xml
index 6e1c582..5d14afe 100644
--- a/features/org.eclipse.papyrus.designer.feature/feature.xml
+++ b/features/org.eclipse.papyrus.designer.feature/feature.xml
@@ -50,10 +50,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.papyrus.designer.ucm.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.papyrus.designer.realtime.feature"
version="0.0.0"/>
diff --git a/releng/org.eclipse.papyrus.designer.p2/siteTemplate/index.html b/releng/org.eclipse.papyrus.designer.p2/siteTemplate/index.html
index e96d704..2650f2b 100644
--- a/releng/org.eclipse.papyrus.designer.p2/siteTemplate/index.html
+++ b/releng/org.eclipse.papyrus.designer.p2/siteTemplate/index.html
@@ -45,9 +45,8 @@
terms, and install.</li>
<p class="bodyText">You can also download Designer as individual zips for
- offline installation. See<a class="link"
- href="../../downloads/${eclipse.target}/rcps/">Designer product
- Downloads</a>.<br />
+ offline installation. See <a class="link"
+ href="../downloads/${eclipse.target}/products/">Designer product downloads</a>.<br />
</p>
</ol>
</blockquote>
@@ -69,12 +68,12 @@
<td>
<table width="100%">
<tr class="header">
- <td class="sub-header" width="100%"><span> More informations</span></td>
+ <td class="sub-header" width="100%"><span> More information</span></td>
</tr>
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<h4>Documentation</h4>
- <p class="bodyText">You can check here the web site <a href="${project.website}">documentation</a>.</p>
+ <p class="bodyText">Check out the project's <a href="https://wiki.eclipse.org/Papyrus_Software_Designer">wiki page</a>.</p>
<br />
</td>
@@ -96,12 +95,11 @@
<td class="bodyText">
<h4>Nightly Builds</h4>
- <p>The <a
- href="${update.site.nightly}">bleeding
- edge</a> contains the latest and greatest new features, but nothing is
- stable or guaranteed - yet. If you're using a Milestone and need a
- fix, you can update to the latest Nightly, or wait for the next
- Milestone.</p><br/>
+ <p>
+ The <a href="https://ci.eclipse.org/papyrus/view/Designer/">bleeding edge</a>
+ contains CI jobs with nightly builds, but nothing is stable or guaranteed.
+ If you're using a Milestone and need a fix, you can update to the latest Nightly,
+ or wait for the next Milestone.</p><br/>
</td>
</tr>
</table>
diff --git a/releng/org.eclipse.papyrus.designer.product/p2.inf b/releng/org.eclipse.papyrus.designer.product/p2.inf
new file mode 100644
index 0000000..447a695
--- /dev/null
+++ b/releng/org.eclipse.papyrus.designer.product/p2.inf
@@ -0,0 +1,7 @@
+instructions.configure=\
+ addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
+ addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
+ addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/designer,name:Papyrus SW designer release);\
+ addRepository(type:1,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/designer,name:Papyrus SW designer release);\
+ addRepository(type:0,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/marte,name:MARTE);\
+ addRepository(type:1,location:https${#58}//download.eclipse.org/modeling/mdt/papyrus/components/marte,name:MARTE);
diff --git a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
index 1175af5..b904a11 100644
--- a/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
+++ b/releng/org.eclipse.papyrus.designer.product/papyrusDesigner.product
@@ -22,7 +22,7 @@
<launcherArgs>
<programArgs>-showsplash org.eclipse.papyrus.designer.rcp --launcher.XXMaxPermSize 256m
</programArgs>
- <vmArgs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m
+ <vmArgs>-Xms256m -Xmx1024m
</vmArgs>
<vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
diff --git a/releng/org.eclipse.papyrus.designer.product/pom.xml b/releng/org.eclipse.papyrus.designer.product/pom.xml
index dae629b..8eb0453 100644
--- a/releng/org.eclipse.papyrus.designer.product/pom.xml
+++ b/releng/org.eclipse.papyrus.designer.product/pom.xml
@@ -27,7 +27,7 @@
<configuration>
<profile>org.eclipse.papyrus.designer</profile>
<formats>
- <linux>zip</linux>
+ <linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
<products>
@@ -63,4 +63,4 @@
</build>
<name>org.eclipse.papyrus.designer.product</name>
<description>This plugins defines the product used in the RCP Designer.</description>
-</project>
\ No newline at end of file
+</project>
