From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 12 Aug 2016 21:41:18 +0000 (+0300)
Subject: Merge branch 'master' of ssh://www.simantics.org:29417/simantics/platform
X-Git-Tag: v1.25.0~183
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=6e1a95d974ec09db0f8c52fed5dbb0211a232edb;hp=50ba3f4758fe7001849e25f278461ece97dd490b

Merge branch 'master' of ssh://www.simantics.org:29417/simantics/platform
---

diff --git a/bundles/pom.xml b/bundles/pom.xml
index 196190420..bd57a96fe 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -23,19 +23,19 @@
                     <compilerArgument>-err:-forbidden</compilerArgument>
                 </configuration>
             </plugin>
-	    <plugin>
-	      <groupId>org.eclipse.tycho</groupId>
-	      <artifactId>tycho-source-plugin</artifactId>
-	      <version>${tycho.version}</version>
-	      <executions>
-		<execution>
-		  <id>plugin-source</id>
-		  <goals>
-		    <goal>plugin-source</goal>
-		  </goals>
-		</execution>
-	      </executions>
-	    </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-source-plugin</artifactId>
+                <version>${tycho.version}</version>
+                <executions>
+                    <execution>
+                        <id>plugin-source</id>
+                        <goals>
+                            <goal>plugin-source</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe
new file mode 100644
index 000000000..e5c6f3bbb
Binary files /dev/null and b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe differ
diff --git a/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe
new file mode 100644
index 000000000..ffc52a8ba
Binary files /dev/null and b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe differ
diff --git a/features/org.simantics.ui.workbench.feature/feature.xml b/features/org.simantics.ui.workbench.feature/feature.xml
index 14be2cf1d..87b3ea7af 100644
--- a/features/org.simantics.ui.workbench.feature/feature.xml
+++ b/features/org.simantics.ui.workbench.feature/feature.xml
@@ -158,7 +158,6 @@
          version="0.0.0"
          unpack="false"/>
 
-<!--
    <plugin
          id="org.simantics.editors.win32"
          os="win32"
@@ -166,7 +165,6 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
--->
 
    <plugin
          id="org.eclipse.ui.editors"
diff --git a/features/pom.xml b/features/pom.xml
index 929b97514..5ad3c0dfa 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -15,24 +15,24 @@
 
     <build>
       <plugins>
-	<plugin>
-	  <groupId>org.eclipse.tycho.extras</groupId>
-	  <artifactId>tycho-source-feature-plugin</artifactId>
-	  <version>${tycho.extras.version}</version>
-	  <executions>
-	    <execution>
-	      <id>source-feature</id>
-	      <phase>package</phase>
-	      <goals>
-		<goal>source-feature</goal>
-	      </goals>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-source-feature-plugin</artifactId>
+          <version>${tycho.extras.version}</version>
+          <executions>
+            <execution>
+              <id>source-feature</id>
+              <phase>package</phase>
+              <goals>
+                <goal>source-feature</goal>
+              </goals>
               <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.poi.ooxml-schemas"/>
-		  
+
                   <plugin id="org.eclipse.core.filesystem.aix.ppc"/>
                   <plugin id="org.eclipse.core.filesystem.aix.ppc64"/>
                   <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>
@@ -51,46 +51,46 @@
                   <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="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.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"/>
 
                   <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"/>
-		  <feature id="org.eclipse.equinox.executable"/>		  
+                  <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"/>
+                  <feature id="org.eclipse.equinox.executable"/>
                 </excludes>
-              </configuration>	      
-	    </execution>
-	  </executions>
-	</plugin>
-	<plugin>
-	  <groupId>org.eclipse.tycho</groupId>
-	  <artifactId>tycho-p2-plugin</artifactId>
-	  <version>${tycho.version}</version>
-	  <executions>
-	    <execution>
-	      <id>attach-p2-metadata</id>
-	      <phase>package</phase>
-	      <goals>
-		<goal>p2-metadata</goal>
-	      </goals>
-	    </execution>
-	  </executions>
-	</plugin>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <executions>
+            <execution>
+              <id>attach-p2-metadata</id>
+              <phase>package</phase>
+              <goals>
+                <goal>p2-metadata</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </build>