Upgraded to Eclipse 4.14 based target platform

* 32-bit platform is no more

gitlab simantics/platform#405

diff --git a/bundles/org.simantics.fmu/src/org/simantics/fmu/FMUControlJNI.java b/bundles/org.simantics.fmu/src/org/simantics/fmu/FMUControlJNI.java
index 4fd80f18deed3965d37eca9706da7e7f4bec8a87..6d23c258028bfbae16a670705bc3f26170170d71 100644 (file)
--- a/bundles/org.simantics.fmu/src/org/simantics/fmu/FMUControlJNI.java
+++ b/bundles/org.simantics.fmu/src/org/simantics/fmu/FMUControlJNI.java
@@ -40,9 +40,7 @@ public class FMUControlJNI {
         \r
         ExecEnvironment env = ExecEnvironment.calculate();\r
         if (env.os == OSType.WINDOWS) {\r
-            if (env.arch == ARCHType.X86) {\r
-                bundle = Platform.getBundle("org.simantics.fmu.me.win32");\r
-            } else if (env.arch == ARCHType.X86_64) {\r
+            if (env.arch == ARCHType.X86_64) {\r
                 bundle = Platform.getBundle("org.simantics.fmu.me.win64");\r
             }\r
         }\r

diff --git a/bundles/pom.xml b/bundles/pom.xml
index bac0984741579262cf643e31669f89b443f877e6..87040a238868897d10eccd05545dedaed9be85d0 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -42,7 +42,6 @@
     <modules>
         <module>fi.semantum.sysdyn.solver</module>
         <module>org.simantics.fmu</module>
-        <module>org.simantics.fmu.me.win32</module>
         <module>org.simantics.fmu.me.win64</module>
         <module>org.simantics.jfreechart</module>
         <module>org.simantics.jfreechart.ontology</module>

diff --git a/features/org.simantics.sysdyn.internal.feature/build.properties b/features/org.simantics.sysdyn.internal.feature/build.properties
index 02cbdc37ef09a04cbf8044b2a82cb7497c98651c..433983201bca835d122685d99b8960bc3dee8c55 100644 (file)
--- a/features/org.simantics.sysdyn.internal.feature/build.properties
+++ b/features/org.simantics.sysdyn.internal.feature/build.properties
@@ -12,5 +12,4 @@
 bin.includes = feature.xml\r
 root=rootfiles/\r
 \r
-#root.win32.win32.x86.folder.jre=jre/win32.x86\r
-#root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file
+#root.win32.win32.x86_64.folder.jre=jre/win32.x86_64\r

diff --git a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
index 9be31b8f810c14bd8957ac590bc5e3f22aabc563..247110834bc9cd8e7fbf47f68c574e7ed8193d6e 100644 (file)
--- a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
@@ -114,15 +114,6 @@ v1.0 which accompanies this distribution, and is available at
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-   <plugin\r
-         id="org.simantics.fmu.me.win32"\r
-         os="win32"\r
-         arch="x86"\r
-         download-size="0"\r
-         install-size="0"\r
-         version="0.0.0"\r
-         fragment="true"/>\r
-\r
    <plugin\r
          id="org.simantics.fmu.me.win64"\r
          os="win32"\r

diff --git a/features/pom.xml b/features/pom.xml
index e433ffe165fea71df7ce027fdf204268dc53f221..e2c36c529a8220eca3e574168ce48dc60bd7cc62 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,67 +29,17 @@
               <configuration>\r
                 <excludes>\r
                   <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->\r
-                  <!--\r
-                                 <plugin id="com.famfamfam.silk"/>\r
-                  <plugin id="javax.vecmath"/>\r
-                  <plugin id="org.apache.batik"/>\r
-                  <plugin id="org.apache.poi"/>\r
-\r
-                  <plugin id="org.eclipse.core.filesystem.aix.ppc"/>\r
-                  <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>\r
-                  <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>\r
-                  <plugin id="org.eclipse.core.filesystem.linux.x86"/>\r
-                  <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>\r
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc"/>\r
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>\r
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>\r
-                  <plugin id="org.eclipse.core.filesystem.macosx"/>\r
-                  <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>\r
-                  <plugin id="org.eclipse.core.filesystem.win32.x86"/>\r
-                  <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>\r
-                  <plugin id="org.eclipse.core.net.linux.x86"/>\r
-                  <plugin id="org.eclipse.core.net.linux.x86_64"/>\r
-                  <plugin id="org.eclipse.core.net.win32.x86"/>\r
-                  <plugin id="org.eclipse.core.net.win32.x86_64"/>\r
-                  <plugin id="org.eclipse.core.resources.win32.x86"/>\r
-                  <plugin id="org.eclipse.core.resources.win32.x86_64"/>\r
-                  <plugin id="javax.xml"/>\r
-                  <plugin id="org.sat4j.core"/>\r
-                  <plugin id="org.sat4j.pb"/>\r
-                  <plugin id="org.eclipse.mylyn.wikitext.core"/>\r
-                  <plugin id="org.eclipse.mylyn.wikitext.core.ant"/>\r
-                  <plugin id="org.eclipse.mylyn.wikitext.core.osgi"/>\r
-                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.core"/>\r
-                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>\r
-                  <plugin id="org.eclipse.mylyn.wikitext.ui"/>\r
-                  <plugin id="org.simantics.help.files"/>\r
-\r
-                  <feature id="org.apache.poi.feature"/>\r
-                  <feature id="org.eclipse.ecf.core.feature"/>\r
-                  <feature id="org.eclipse.ecf.core.ssl.feature"/>\r
-                  <feature id="org.eclipse.ecf.filetransfer.feature"/>\r
-                  <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>\r
-                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>\r
-                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>\r
-                  <feature id="org.eclipse.emf.common"/>\r
-                  <feature id="org.eclipse.emf.ecore"/>\r
-                  <feature id="org.eclipse.epp.mpc"/>\r
-                  <feature id="org.eclipse.equinox.p2.discovery.feature"/>\r
-                  -->\r
                   <plugin id="org.simantics.fileimport"/>\r
-                  <plugin id="org.simantics.fmu.me.win32"/>\r
                   <plugin id="org.simantics.fmu.me.win64"/>\r
                   <plugin id="org.simantics.sysdyn.product"/>\r
-                                 \r
-                                 <feature id="org.eclipse.equinox.executable"/>\r
-                                 <feature id="org.simantics.eclipsec.launcher"/>\r
-                                 <feature id="org.simantics.help"/>\r
-                                 <feature id="org.simantics.issues.feature"/>\r
-                                 <feature id="org.simantics.issues.ui.feature"/>\r
-                                 <feature id="org.simantics.modeling"/>\r
-                                 <feature id="org.simantics.workbench"/>\r
-                                 \r
-                               </excludes>\r
+                 <feature id="org.eclipse.equinox.executable"/>\r
+                 <feature id="org.simantics.eclipsec.launcher"/>\r
+                 <feature id="org.simantics.help"/>\r
+                 <feature id="org.simantics.issues.feature"/>\r
+                 <feature id="org.simantics.issues.ui.feature"/>\r
+                 <feature id="org.simantics.modeling"/>\r
+                 <feature id="org.simantics.workbench"/>\r
+               </excludes>\r
               </configuration>\r
             </execution>\r
           </executions>\r

diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index 360cfd7eb0253a2774fa3c66841af2e6a5420c29..e68d200117bb7884ce92558a49b946d010259fd8 100644 (file)
--- a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
+++ b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
@@ -87,11 +87,6 @@
                                                        <arch>x86_64</arch>
                                                </environment>
 -->
-                                               <environment>
-                                                       <os>win32</os>
-                                                       <ws>win32</ws>
-                                                       <arch>x86</arch>
-                                               </environment>
                                                <environment>
                                                        <os>win32</os>
                                                        <ws>win32</ws>