From: Miro Richard Eklund Date: Wed, 19 Jul 2017 11:58:56 +0000 (+0300) Subject: (refs #7358) Mars to Oxygen updates X-Git-Tag: v1.31.0~267 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=388dda421e7439aeacf70a52e97cf6da0ae95a40;p=simantics%2Fplatform.git (refs #7358) Mars to Oxygen updates +Removed org.eclipse.epp.mpc feature from simantics.desktop and sdk, as the latest version contained unwanted org.eclipse.mpc.epp.core.win32. Instead, hand-picked the three plug-ins that are needed for org.eclipse.epp.mpc (ui, help.ui and core). +Updated target definition to use new mirror-sites and removed defintion that bloated the file. +Added oxygen-specific feature project and set simantics-desktop.product to use it. +Updated simantics.target +Updated rcp feature to no longer depend on org.eclipse.core.filesystem.java7 (see number 3 here: https://help.eclipse.org/neon/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fporting%2F4.6%2Fincompatibilities.html&anchor=filesystem.java7) +Included oxygen.feature into pom.xml under root->features +Added missing source files +Changed project type of org.simantics.root to maven +Updated mirror-location url to be correct (dropin no longer has /repository/ at the end) Change-Id: Id20a3626dbce81cb2a45036d1983d55c151d7e52 --- diff --git a/.project b/.project index fb77e3820..4b7d21c7e 100644 --- a/.project +++ b/.project @@ -5,7 +5,13 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature diff --git a/features/org.simantics.desktop.feature/feature.xml b/features/org.simantics.desktop.feature/feature.xml index 998bb4abd..59e0ec2e9 100644 --- a/features/org.simantics.desktop.feature/feature.xml +++ b/features/org.simantics.desktop.feature/feature.xml @@ -45,10 +45,6 @@ id="org.simantics.eclipsec.launcher" version="0.0.0"/> - - @@ -73,5 +69,25 @@ install-size="0" version="0.0.0" unpack="false"/> + + + + + diff --git a/features/org.simantics.desktop.product.oxygen.feature/.project b/features/org.simantics.desktop.product.oxygen.feature/.project new file mode 100644 index 000000000..cbecb48b2 --- /dev/null +++ b/features/org.simantics.desktop.product.oxygen.feature/.project @@ -0,0 +1,17 @@ + + + org.simantics.desktop.product.oxygen.feature + + + + + + org.eclipse.pde.FeatureBuilder + + + + + + org.eclipse.pde.FeatureNature + + diff --git a/features/org.simantics.desktop.product.oxygen.feature/build.properties b/features/org.simantics.desktop.product.oxygen.feature/build.properties new file mode 100644 index 000000000..64f93a9f0 --- /dev/null +++ b/features/org.simantics.desktop.product.oxygen.feature/build.properties @@ -0,0 +1 @@ +bin.includes = feature.xml diff --git a/features/org.simantics.desktop.product.oxygen.feature/feature.xml b/features/org.simantics.desktop.product.oxygen.feature/feature.xml new file mode 100644 index 000000000..f467a77ac --- /dev/null +++ b/features/org.simantics.desktop.product.oxygen.feature/feature.xml @@ -0,0 +1,103 @@ + + + + + [Enter Feature Description here.] + + + + [Enter Copyright Description here.] + + + + [Enter License Description here.] + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml index c1610fdc6..3a2453610 100644 --- a/features/org.simantics.rcp.feature/feature.xml +++ b/features/org.simantics.rcp.feature/feature.xml @@ -153,44 +153,6 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0" unpack="false"/> - - - - - - - - - - - - - - @@ -248,22 +244,22 @@ + + + + + + diff --git a/features/pom.xml b/features/pom.xml index 7c31bd537..7a9a67a3f 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -62,7 +62,9 @@ + + @@ -110,6 +112,7 @@ org.simantics.db.services.feature org.simantics.desktop.feature org.simantics.desktop.product.feature + org.simantics.desktop.product.oxygen.feature org.simantics.document.base.feature org.simantics.document.linking.feature org.simantics.document.swt.feature diff --git a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product index f68f507c0..f3900f496 100644 --- a/releng/org.simantics.desktop.rcp.product/simantics-desktop.product +++ b/releng/org.simantics.desktop.rcp.product/simantics-desktop.product @@ -39,7 +39,6 @@ org.eclipse.e4.ui.css.theme.e4_classic - @@ -58,16 +57,9 @@ org.eclipse.e4.ui.css.theme.e4_classic + - - - - - - - - @@ -76,4 +68,11 @@ org.eclipse.e4.ui.css.theme.e4_classic + + + + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 9f397a634..0a6c2786f 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -4,6 +4,8 @@ + + @@ -13,9 +15,10 @@ + - + @@ -27,6 +30,7 @@ + @@ -43,11 +47,16 @@ + + + + - - + + + @@ -80,7 +89,7 @@ - + @@ -110,7 +119,7 @@ - + @@ -138,8 +147,6 @@ - - @@ -166,10 +173,6 @@ - - - - @@ -248,16 +251,12 @@ - - - - @@ -302,1053 +301,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd index 5bdc12559..d11eb9f58 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.tpd @@ -1,4 +1,4 @@ -target "Eclipse Oxygen" +target "Eclipse Oxygen" with source allEnvironments @@ -43,11 +43,16 @@ location "http://download.eclipse.org/releases/oxygen" { org.eclipse.mylyn.wikitext_feature.feature.group org.eclipse.emf.sdk.feature.group org.eclipse.epp.mpc.feature.group + org.eclipse.epp.mpc.source.feature.group org.eclipse.userstorage.feature.group //Needed for org.eclipse.epp.mpc.core org.eclipse.userstorage.oauth //Needed for org.eclipse.epp.mpc.core org.eclipse.userstorage.oauth.source //Needed for org.eclipse.epp.mpc.core org.jsoup //Needed for org.eclipse.mylyn.wikitext_feature.feature.group org.eclipse.draw2d.feature.group //Needed for org.eclipse.nebula.visualization.* + org.eclipse.mylyn.wikitext.source + org.eclipse.mylyn.wikitext.ant.source + org.eclipse.mylyn.wikitext.osgi.source + org.eclipse.mylyn.wikitext.mediawiki.source } location "http://download.eclipse.org/eclipse/updates/4.7" { @@ -111,7 +116,7 @@ location "http://download.eclipse.org/nattable/releases/1.5.0/repository" { org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group - org.eclipse.nebula.widgets.nattable.extension.glazedlists.source + org.eclipse.nebula.widgets.nattable.extension.glazedlists.source.feature.feature.group org.eclipse.nebula.widgets.nattable.extension.nebula.feature.feature.group org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group diff --git a/releng/org.simantics.sdk.build.targetdefinition/simantics.target b/releng/org.simantics.sdk.build.targetdefinition/simantics.target index 81395cf50..c84ffd282 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/simantics.target +++ b/releng/org.simantics.sdk.build.targetdefinition/simantics.target @@ -1,9 +1,11 @@ - + + + @@ -13,9 +15,10 @@ + - + @@ -27,6 +30,7 @@ + @@ -43,11 +47,16 @@ + + + + - - + + + @@ -80,7 +89,7 @@ - + @@ -110,7 +119,7 @@ - + @@ -138,8 +147,6 @@ - - @@ -244,16 +251,12 @@ - - - - @@ -303,1876 +306,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file