diff options
author | Florian Noyrit | 2015-09-04 09:22:17 +0000 |
---|---|---|
committer | Florian Noyrit | 2015-09-04 09:37:42 +0000 |
commit | 971ad854a33c487ef0b5f6f31b4c10e908a9f945 (patch) | |
tree | cd71f2313395a868d3e9bd4fc75c2b3748e69c73 | |
parent | b1a80d2d2c2e530aeb7e092c9f3678038d935f8b (diff) | |
download | org.eclipse.papyrus-971ad854a33c487ef0b5f6f31b4c10e908a9f945.tar.gz org.eclipse.papyrus-971ad854a33c487ef0b5f6f31b4c10e908a9f945.tar.xz org.eclipse.papyrus-971ad854a33c487ef0b5f6f31b4c10e908a9f945.zip |
[releng] Update for Neon build and adapt about page
Signed-off-by: Florian Noyrit <florian.noyrit@cea.fr>
-rwxr-xr-x | releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml | 4 | ||||
-rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.product/category.xml | 4 | ||||
-rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product | 189 | ||||
-rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini | 1 | ||||
-rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/about.mappings | 7 | ||||
-rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/build.properties | 3 | ||||
-rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/plugin.xml | 10 | ||||
-rw-r--r-- | releng/rcp/pom.xml | 103 |
8 files changed, 193 insertions, 128 deletions
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml index ec66c820cd9..a5a1e3e3144 100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml @@ -27,8 +27,8 @@ http://www.eclipse.org/legal/epl-v10.html </license> <url> - <discovery label="Mars" url="http://download.eclipse.org/releases/mars/"/> - <discovery label="Eclipse Platform 4.5" url="http://download.eclipse.org/eclipse/updates/4.5"/> + <discovery label="Neon" url="http://download.eclipse.org/releases/neon/"/> + <discovery label="Eclipse Platform 4.6" url="http://download.eclipse.org/eclipse/updates/4.6"/> </url> <requires> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml deleted file mode 100644 index ad5e931b1b3..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<site> - <feature url="org.eclipse.papyrus.rcp.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.rcp.feature" version="1.2.0.qualifier"/> -</site> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product index e0f6f0d78a9..f28c0928eec 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product +++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product @@ -1,58 +1,59 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.1.0.qualifier" useFeatures="true" includeLaunchers="true">
-
- <aboutInfo>
- <image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
- <text>
+<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.2.0.qualifier" useFeatures="true" includeLaunchers="true"> + + <aboutInfo> + <image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/> + <text> Papyrus -Version: 1.1.0 - -(c) Copyright Eclipse contributors and others 2000, 2013. All rights reserved. -Visit http://www.eclipse.org/platform - -This product includes software developed by the -Apache Software Foundation http://www.apache.org/
- </text>
- </aboutInfo>
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
- <programArgs>-showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile
- </programArgs>
- <vmArgs>-Xms128m -Xmx900m
- </vmArgs>
- <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
- </vmArgsMac>
- </launcherArgs>
-
- <windowImages i16="/org.eclipse.papyrus.rcp/icons/papyrus16.png" i32="/org.eclipse.papyrus.rcp/icons/papyrus32.png" i48="/org.eclipse.papyrus.rcp/icons/papyrus48.png" i64="/org.eclipse.papyrus.rcp/icons/papyrus64.png" i128="/org.eclipse.papyrus.rcp/icons/papyrus128.png"/>
-
- <splash
- location="org.eclipse.papyrus.rcp"
- startupProgressRect="0,330,460,20"
- startupMessageRect="7,4,445,16"
- startupForegroundColor="9C9E9F" />
- <launcher name="papyrus">
- <linux icon="../org.eclipse.papyrus.rcp/icons/icon.xpm"/>
- <macosx icon="../org.eclipse.papyrus.rcp/icons/papyrus.icns"/>
- <solaris/>
- <win useIco="true">
- <ico path="../org.eclipse.papyrus.rcp/icons/papyrus.ico"/>
- <bmp/>
- </win>
- </launcher>
-
- <vm>
- </vm>
-
- <license>
- <url>http://eclipse.org/legal/epl/notice.php</url>
- <text>
+Version: {1} +Build id: {0} + +Copyright CEA LIST and others 2015. http://www.eclipse.org/papyrus + +(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. + +This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/. + </text> + </aboutInfo> + + <configIni use="default"> + </configIni> + + <launcherArgs> + <programArgs>-showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile + </programArgs> + <vmArgs>-Xms128m -Xmx900m + </vmArgs> + <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> + </launcherArgs> + + <windowImages i16="/org.eclipse.papyrus.rcp/icons/papyrus16.png" i32="/org.eclipse.papyrus.rcp/icons/papyrus32.png" i48="/org.eclipse.papyrus.rcp/icons/papyrus48.png" i64="/org.eclipse.papyrus.rcp/icons/papyrus64.png" i128="/org.eclipse.papyrus.rcp/icons/papyrus128.png"/> + + <splash + location="org.eclipse.papyrus.rcp" + startupProgressRect="0,330,460,20" + startupMessageRect="7,4,445,16" + startupForegroundColor="9C9E9F" /> + <launcher name="papyrus"> + <linux icon="../org.eclipse.papyrus.rcp/icons/icon.xpm"/> + <macosx icon="../org.eclipse.papyrus.rcp/icons/papyrus.icns"/> + <solaris/> + <win useIco="true"> + <ico path="../org.eclipse.papyrus.rcp/icons/papyrus.ico"/> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <license> + <url>http://eclipse.org/legal/epl/notice.php</url> + <text> Eclipse Foundation Software User Agreement February 1, 2015 @@ -175,44 +176,44 @@ using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. -Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
- </text>
- </license>
-
- <plugins>
- </plugins>
-
- <features>
- <feature id="org.eclipse.platform"/>
- <feature id="org.eclipse.equinox.p2.user.ui"/>
- <feature id="org.eclipse.rcp.configuration"/>
- <feature id="org.eclipse.papyrus.rcp.feature"/>
- </features>
-
- <configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
- <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
- <property name="org.eclipse.update.reconcile" value="false" />
- <property name="osgi.bundles.defaultStartLevel" value="4" />
- <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus" />
- </configurations>
-
- <repositories>
- <repository location="http://download.eclipse.org/releases/mars/" enabled="true" />
- <repository location="http://download.eclipse.org/eclipse/updates/4.5" enabled="true" />
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars" enabled="true" />
- </repositories>
-
- <preferencesInfo>
- <targetfile overwrite="false"/>
- </preferencesInfo>
-
- <cssInfo>
- </cssInfo>
-
-</product>
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both. + </text> + </license> + + <plugins> + </plugins> + + <features> + <feature id="org.eclipse.platform"/> + <feature id="org.eclipse.equinox.p2.user.ui"/> + <feature id="org.eclipse.rcp.configuration"/> + <feature id="org.eclipse.papyrus.rcp.feature"/> + </features> + + <configurations> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" /> + <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> + <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" /> + <property name="org.eclipse.update.reconcile" value="false" /> + <property name="osgi.bundles.defaultStartLevel" value="4" /> + <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus" /> + </configurations> + + <repositories> + <repository location="http://download.eclipse.org/releases/neon/" enabled="true" /> + <repository location="http://download.eclipse.org/eclipse/updates/4.6" enabled="true" /> + <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon" enabled="true" /> + </repositories> + + <preferencesInfo> + <targetfile overwrite="false"/> + </preferencesInfo> + + <cssInfo> + </cssInfo> + +</product> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini b/releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini deleted file mode 100644 index 333fab9da76..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true diff --git a/releng/rcp/org.eclipse.papyrus.rcp/about.mappings b/releng/rcp/org.eclipse.papyrus.rcp/about.mappings new file mode 100644 index 00000000000..de1370b4e31 --- /dev/null +++ b/releng/rcp/org.eclipse.papyrus.rcp/about.mappings @@ -0,0 +1,7 @@ +# about.mappings +# contains fill-ins for about.properties +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file does not need to be translated. + +0=@eclipse.simultaneous.release.build@ +1=@eclipse.simultaneous.release.name@ diff --git a/releng/rcp/org.eclipse.papyrus.rcp/build.properties b/releng/rcp/org.eclipse.papyrus.rcp/build.properties index 22f786ca503..11288a6e9f5 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/build.properties +++ b/releng/rcp/org.eclipse.papyrus.rcp/build.properties @@ -3,5 +3,6 @@ bin.includes = META-INF/,\ plugin.xml,\ splash.bmp,\ icons/,\ - plugin_customization.ini + plugin_customization.ini,\ + about.mappings
\ No newline at end of file diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml index 2c19eb0cad1..26536ee6cfd 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml @@ -38,10 +38,6 @@ value="0,330,460,20"> </property> <property - name="preferenceCustomization" - value="plugin_customization.ini"> - </property> - <property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default"> </property> @@ -51,7 +47,11 @@ </property> <property name="aboutText" - value="Papyrus

Version: 1.0.0

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/"> + value="Papyrus

Version: {1}
Build id: {0}

Copyright CEA LIST and others 2015. http://www.eclipse.org/papyrus

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse's permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
"> + </property> + <property + name="preferenceCustomization" + value="plugin_customization.ini"> </property> </product> </extension> diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml index ebb047e4dda..028458e9b89 100644 --- a/releng/rcp/pom.xml +++ b/releng/rcp/pom.xml @@ -18,38 +18,37 @@ <xtext.version>2.7.3</xtext.version> <java.source.version>1.7</java.source.version> <java.target.version>1.7</java.target.version> - <papyrus.eclipse.target>mars</papyrus.eclipse.target> + <papyrus.eclipse.target>neon</papyrus.eclipse.target> <mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version> <skipAllTests>false</skipAllTests> <skipInnerTests>true</skipInnerTests> <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main> + <maven.resources.version>2.6</maven.resources.version> + <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) --> + <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build> + <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) --> + <eclipse.simultaneous.release.name>Neon Milestone 1 (4.6.0M1)</eclipse.simultaneous.release.name> </properties> <repositories> <!-- From Main Papyrus --> <repository> - <id>ep</id> - <layout>p2</layout> - <!-- updateFrom("Eclipse",0) --> - <url>http://download.eclipse.org/eclipse/updates/4.5/R-4.5-201506032000/</url> - </repository> - <repository> <id>emf-emf</id> <layout>p2</layout> <!-- updateFrom("EMF (Core)",0) --> - <url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url> + <url>http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/</url> </repository> <repository> <id>emft-mwe[0]</id> <layout>p2</layout> <!-- updateFrom("EMFT MWE",0) --> - <url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.0/R201505260335/mwe</url> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/R201508030321/mwe</url> </repository> <repository> <id>emft-mwe[1]</id> <layout>p2</layout> <!-- updateFrom("EMFT MWE",1) --> - <url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.0/R201505260456/mwe2lang/</url> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.1/R201508030411/mwe2lang/</url> </repository> <repository> <id>emf-transaction</id> @@ -64,6 +63,12 @@ <url>http://download.eclipse.org/modeling/emf/validation/updates/releases/R201505312255</url> </repository> <repository> + <id>ep</id> + <layout>p2</layout> + <!-- updateFrom("Eclipse",0) --> + <url>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M1-201508052000/</url> + </repository> + <repository> <id>gef</id> <layout>p2</layout> <!-- updateFrom("GEF",0) --> @@ -91,13 +96,13 @@ <id>m2t-xpand</id> <layout>p2</layout> <!-- updateFrom("M2T XPAND",0) --> - <url>http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201505260349/</url> + <url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201508180411/</url> </repository> <repository> <id>mdt-ocl</id> <layout>p2</layout> <!-- updateFrom("MDT OCL 6.0",0) --> - <url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.0.0</url> + <url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201508171259</url> </repository> <repository> <id>mdt-uml2</id> @@ -134,13 +139,13 @@ <id>tmf-xtext</id> <layout>p2</layout> <!-- updateFrom("Xtext, Xtend",0) --> - <url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.3/</url> + <url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url> </repository> <repository> <id>webtools</id> <layout>p2</layout> <!-- updateFrom("WebTools",0) --> - <url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/R-3.7.0-20150609111814/repository/</url> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M1-20150818010140/repository/</url> </repository> <repository> <id>XWT</id> @@ -152,8 +157,8 @@ <id>subversive</id> <layout>p2</layout> <!-- updateFrom("Subversive",0) --> - <url>http://download.eclipse.org/technology/subversive/3.0/mars-site/</url> - </repository> + <url>http://download.eclipse.org/technology/subversive/3.0/neon-site/</url> + </repository> <!-- Modeling features --> @@ -173,19 +178,19 @@ <id>emf-compare</id> <layout>p2</layout> <!-- updateFrom("EMF Compare",0) --> - <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201506080833</url> + <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201508181443</url> </repository> <repository> <id>emf-cdo</id> <layout>p2</layout> <!-- updateFrom("EMF CDO",0) --> - <url>http://download.eclipse.org/modeling/emf/cdo/drops/R20150610-1526</url> + <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20150819-1258</url> </repository> <repository> <id>egit</id> <layout>p2</layout> <!-- updateFrom("EGIT",0) --> - <url>http://download.eclipse.org/egit/updates-4.0</url> + <url>http://download.eclipse.org/egit/updates-4.0.1</url> </repository> <repository> <id>eef</id> @@ -197,7 +202,7 @@ <id>acceleo</id> <layout>p2</layout> <!-- updateFrom("acceleo",0) --> - <url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201506080954</url> + <url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201508181441</url> </repository> <repository> <id>epp-log</id> @@ -209,7 +214,7 @@ <id>oomph</id> <layout>p2</layout> <!-- updateFrom("oomph",0) --> - <url>http://download.eclipse.org/oomph/drops/milestone/S20150610-124713-1.1.0-RC4</url> + <url>http://download.eclipse.org/oomph/drops/milestone/S20150819-113829-1.2.0-M1</url> </repository> <!--<repository> <id>ecp</id> @@ -301,4 +306,60 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>update-branding-plugins-about.mappings</id> + <activation> + <file> + <exists>${basedir}/about.mappings</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven.resources.version}</version> + <executions> + <execution> + <id>process-about.mappings</id> + <phase>prepare-package</phase> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>${basedir}</directory> + <includes> + <include>about.mappings</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + <goals> + <goal>copy-resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <additionalFileSets> + <fileSet> + <directory>${project.build.directory}</directory> + <includes> + <include>about.mappings</include> + </includes> + </fileSet> + </additionalFileSets> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> |