Working to get full platform to build working on linux

Moved org.simantics.editors.win32 plugin and the feature newly created
to include it (org.simantics.editors.win32.feature) under the maven
<profile> called win32. So org.simantics.editors.win32 is no longer
included in org.simantics.ui.workbench feature and to build it,
-P win32 needs to be specified to maven.

refs #7358

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 560f55592291af655b804edd1855d2a5177fa006..d7bc89964eab7c1d10a79fa90c7d699caccd8f5a 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -116,7 +116,6 @@
                <module>org.simantics.document.ui.ontology</module>
                <module>org.simantics.dublincore.ontology</module>
                <module>org.simantics.editors</module>
-               <module>org.simantics.editors.win32</module>
                <module>org.simantics.equation</module>
                <module>org.simantics.event</module>
                <module>org.simantics.event.ontology</module>
@@ -239,4 +238,14 @@
                <module>org.simantics.workbench.search</module>
                <module>winterwell.markdown</module>
        </modules>
+
+       <profiles>
+               <profile>
+                       <id>win32</id>
+                       <modules>
+                               <module>org.simantics.editors.win32</module>
+                       </modules>
+               </profile>
+       </profiles>
+
 </project>

diff --git a/features/org.simantics.editors.win32.feature/.project b/features/org.simantics.editors.win32.feature/.project
new file mode 100644 (file)
index 0000000..190f51f
--- /dev/null
+++ b/features/org.simantics.editors.win32.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.simantics.editors.win32.feature</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>
+</projectDescription>

diff --git a/features/org.simantics.editors.win32.feature/build.properties b/features/org.simantics.editors.win32.feature/build.properties
new file mode 100644 (file)
index 0000000..a03b873
--- /dev/null
+++ b/features/org.simantics.editors.win32.feature/build.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2017 Association for Decentralized Information Management
+# in Industry THTH ry.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     VTT Technical Research Centre of Finland - initial API and implementation
+###############################################################################
+bin.includes = feature.xml

diff --git a/features/org.simantics.editors.win32.feature/feature.xml b/features/org.simantics.editors.win32.feature/feature.xml
new file mode 100644 (file)
index 0000000..c27a450
--- /dev/null
+++ b/features/org.simantics.editors.win32.feature/feature.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2017 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
+<feature
+      id="org.simantics.editors.win32.feature"
+      label="OLE Editor Support"
+      version="1.31.0.qualifier"
+      provider-name="VTT Technical Research Centre of Finland">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.simantics.editors.win32"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml
index 2fb2dd54406904b531359c0f603f1de8716f6dfe..c4346791a7bd93a891c1c2b9d2cc625bdb68cd9a 100644 (file)
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -158,14 +158,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.simantics.editors.win32"
-         os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ui.editors"
          download-size="0"

diff --git a/features/pom.xml b/features/pom.xml
index 7a9a67a3f0bce060b23f5ef0178754a042c7a412..9d28eca85fb1a478959ca053d8a261b7ccbd9a37 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -152,4 +152,14 @@
         <module>org.simantics.wiki.ui.feature</module>
         <module>org.simantics.workbench.feature</module>
     </modules>
+
+    <profiles>
+        <profile>
+            <id>win32</id>
+            <modules>
+                <module>org.simantics.editors.win32.feature</module>
+            </modules>
+        </profile>
+    </profiles>
+
 </project>

diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 86c4ce44deb6c4ff6bb1dc38d21c2ebf1976c02a..53fe3b985c231fb995de78a5bd6d211037b38158 100644 (file)
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -66,11 +66,6 @@
                                                </artifact>
                                        </target>
                                        <environments>
-                                               <environment>
-                                                       <os>linux</os>
-                                                       <ws>gtk</ws>
-                                                       <arch>x86</arch>
-                                               </environment>
                                                <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>