From 34fbc04b7c5e6a8fde08d03cab1f44006f25e38f Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Sun, 19 Jan 2020 01:05:49 +0200
Subject: [PATCH] Upgraded to Eclipse 4.14 based target platform

* 32-bit platform is no more

gitlab simantics/platform#405
---
 .../src/org/simantics/fmu/FMUControlJNI.java  |  4 +-
 bundles/pom.xml                               |  1 -
 .../build.properties                          |  3 +-
 .../feature.xml                               |  9 ---
 features/pom.xml                              | 66 +++----------------
 .../pom.xml                                   |  5 --
 6 files changed, 10 insertions(+), 78 deletions(-)

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 4fd80f18..6d23c258 100644
--- 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 {
         
         ExecEnvironment env = ExecEnvironment.calculate();
         if (env.os == OSType.WINDOWS) {
-            if (env.arch == ARCHType.X86) {
-                bundle = Platform.getBundle("org.simantics.fmu.me.win32");
-            } else if (env.arch == ARCHType.X86_64) {
+            if (env.arch == ARCHType.X86_64) {
                 bundle = Platform.getBundle("org.simantics.fmu.me.win64");
             }
         }
diff --git a/bundles/pom.xml b/bundles/pom.xml
index bac09847..87040a23 100644
--- 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 02cbdc37..43398320 100644
--- 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
 root=rootfiles/
 
-#root.win32.win32.x86.folder.jre=jre/win32.x86
-#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
diff --git a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
index 9be31b8f..24711083 100644
--- 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"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.fmu.me.win32"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
    <plugin
          id="org.simantics.fmu.me.win64"
          os="win32"
diff --git a/features/pom.xml b/features/pom.xml
index e433ffe1..e2c36c52 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,67 +29,17 @@
               <configuration>
                 <excludes>
                   <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->
-                  <!--
-				  <plugin id="com.famfamfam.silk"/>
-                  <plugin id="javax.vecmath"/>
-                  <plugin id="org.apache.batik"/>
-                  <plugin id="org.apache.poi"/>
-
-                  <plugin id="org.eclipse.core.filesystem.aix.ppc"/>
-                  <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>
-                  <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.x86"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>
-                  <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
-                  <plugin id="org.eclipse.core.filesystem.macosx"/>
-                  <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
-                  <plugin id="org.eclipse.core.filesystem.win32.x86"/>
-                  <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>
-                  <plugin id="org.eclipse.core.net.linux.x86"/>
-                  <plugin id="org.eclipse.core.net.linux.x86_64"/>
-                  <plugin id="org.eclipse.core.net.win32.x86"/>
-                  <plugin id="org.eclipse.core.net.win32.x86_64"/>
-                  <plugin id="org.eclipse.core.resources.win32.x86"/>
-                  <plugin id="org.eclipse.core.resources.win32.x86_64"/>
-                  <plugin id="javax.xml"/>
-                  <plugin id="org.sat4j.core"/>
-                  <plugin id="org.sat4j.pb"/>
-                  <plugin id="org.eclipse.mylyn.wikitext.core"/>
-                  <plugin id="org.eclipse.mylyn.wikitext.core.ant"/>
-                  <plugin id="org.eclipse.mylyn.wikitext.core.osgi"/>
-                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.core"/>
-                  <plugin id="org.eclipse.mylyn.wikitext.mediawiki.ui"/>
-                  <plugin id="org.eclipse.mylyn.wikitext.ui"/>
-                  <plugin id="org.simantics.help.files"/>
-
-                  <feature id="org.apache.poi.feature"/>
-                  <feature id="org.eclipse.ecf.core.feature"/>
-                  <feature id="org.eclipse.ecf.core.ssl.feature"/>
-                  <feature id="org.eclipse.ecf.filetransfer.feature"/>
-                  <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-                  <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
-                  <feature id="org.eclipse.emf.common"/>
-                  <feature id="org.eclipse.emf.ecore"/>
-                  <feature id="org.eclipse.epp.mpc"/>
-                  <feature id="org.eclipse.equinox.p2.discovery.feature"/>
-                  -->
                   <plugin id="org.simantics.fileimport"/>
-                  <plugin id="org.simantics.fmu.me.win32"/>
                   <plugin id="org.simantics.fmu.me.win64"/>
                   <plugin id="org.simantics.sysdyn.product"/>
-				  
-				  <feature id="org.eclipse.equinox.executable"/>
-				  <feature id="org.simantics.eclipsec.launcher"/>
-				  <feature id="org.simantics.help"/>
-				  <feature id="org.simantics.issues.feature"/>
-				  <feature id="org.simantics.issues.ui.feature"/>
-				  <feature id="org.simantics.modeling"/>
-				  <feature id="org.simantics.workbench"/>
-				  
-				</excludes>
+		  <feature id="org.eclipse.equinox.executable"/>
+		  <feature id="org.simantics.eclipsec.launcher"/>
+		  <feature id="org.simantics.help"/>
+		  <feature id="org.simantics.issues.feature"/>
+		  <feature id="org.simantics.issues.ui.feature"/>
+		  <feature id="org.simantics.modeling"/>
+		  <feature id="org.simantics.workbench"/>
+		</excludes>
               </configuration>
             </execution>
           </executions>
diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml
index 360cfd7e..e68d2001 100644
--- 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>
-- 
2.47.1