From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 10 Aug 2017 12:34:46 +0000 (+0300)
Subject: Working to get full platform to build working on linux
X-Git-Tag: v1.31.0~260
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=b89188868821cb88f1ae45c908b6aad85fcc59e4

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 560f55592..d7bc89964 100644
--- 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
index 000000000..190f51f37
--- /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
index 000000000..a03b87341
--- /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
index 000000000..c27a45037
--- /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 2fb2dd544..c4346791a 100644
--- 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 7a9a67a3f..9d28eca85 100644
--- 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 86c4ce44d..53fe3b985 100644
--- 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>