Merge branch 'master' of ssh://www.simantics.org:29417/simantics/platform
authorTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 12 Aug 2016 21:41:18 +0000 (00:41 +0300)
committerTuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Fri, 12 Aug 2016 21:41:18 +0000 (00:41 +0300)
bundles/pom.xml
features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86/eclipsec.exe [new file with mode: 0644]
features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe [new file with mode: 0644]
features/org.simantics.ui.workbench.feature/feature.xml
features/pom.xml

index 19619042071ca4fd8a5d95163def586a8ebb4427..bd57a96febe2bba2247239d86578b8fee064df8b 100644 (file)
                     <compilerArgument>-err:-forbidden</compilerArgument>\r
                 </configuration>\r
             </plugin>\r
-           <plugin>\r
-             <groupId>org.eclipse.tycho</groupId>\r
-             <artifactId>tycho-source-plugin</artifactId>\r
-             <version>${tycho.version}</version>\r
-             <executions>\r
-               <execution>\r
-                 <id>plugin-source</id>\r
-                 <goals>\r
-                   <goal>plugin-source</goal>\r
-                 </goals>\r
-               </execution>\r
-             </executions>\r
-           </plugin>\r
+            <plugin>\r
+                <groupId>org.eclipse.tycho</groupId>\r
+                <artifactId>tycho-source-plugin</artifactId>\r
+                <version>${tycho.version}</version>\r
+                <executions>\r
+                    <execution>\r
+                        <id>plugin-source</id>\r
+                        <goals>\r
+                            <goal>plugin-source</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
         </plugins>\r
     </build>\r
 \r
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 (file)
index 0000000..e5c6f3b
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 (file)
index 0000000..ffc52a8
Binary files /dev/null and b/features/org.simantics.eclipsec.launcher.feature/bin/win32/win32/x86_64/eclipsec.exe differ
index 14be2cf1d7decb7659631dfa6218c2bc637204c4..87b3ea7af5dbeee97085add6c4109ce5c677f5c3 100644 (file)
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-<!--
    <plugin\r
          id="org.simantics.editors.win32"\r
          os="win32"\r
          install-size="0"\r
          version="0.0.0"\r
          unpack="false"/>\r
--->
 \r
    <plugin\r
          id="org.eclipse.ui.editors"\r
index 929b97514acf1dffc3e7657a708e0721c83f779b..5ad3c0dfa6f1ac5f4263cc97e4026bbf4bc8dfb9 100644 (file)
 \r
     <build>\r
       <plugins>\r
-       <plugin>\r
-         <groupId>org.eclipse.tycho.extras</groupId>\r
-         <artifactId>tycho-source-feature-plugin</artifactId>\r
-         <version>${tycho.extras.version}</version>\r
-         <executions>\r
-           <execution>\r
-             <id>source-feature</id>\r
-             <phase>package</phase>\r
-             <goals>\r
-               <goal>source-feature</goal>\r
-             </goals>\r
+        <plugin>\r
+          <groupId>org.eclipse.tycho.extras</groupId>\r
+          <artifactId>tycho-source-feature-plugin</artifactId>\r
+          <version>${tycho.extras.version}</version>\r
+          <executions>\r
+            <execution>\r
+              <id>source-feature</id>\r
+              <phase>package</phase>\r
+              <goals>\r
+                <goal>source-feature</goal>\r
+              </goals>\r
               <configuration>\r
                 <excludes>\r
                   <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->\r
                   <plugin id="com.famfamfam.silk"/>\r
                   <plugin id="javax.vecmath"/>\r
                   <plugin id="org.apache.poi.ooxml-schemas"/>\r
-                 \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.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="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.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
 \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
-                 <feature id="org.eclipse.equinox.executable"/>                  \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
+                  <feature id="org.eclipse.equinox.executable"/>\r
                 </excludes>\r
-              </configuration>       \r
-           </execution>\r
-         </executions>\r
-       </plugin>\r
-       <plugin>\r
-         <groupId>org.eclipse.tycho</groupId>\r
-         <artifactId>tycho-p2-plugin</artifactId>\r
-         <version>${tycho.version}</version>\r
-         <executions>\r
-           <execution>\r
-             <id>attach-p2-metadata</id>\r
-             <phase>package</phase>\r
-             <goals>\r
-               <goal>p2-metadata</goal>\r
-             </goals>\r
-           </execution>\r
-         </executions>\r
-       </plugin>\r
+              </configuration>\r
+            </execution>\r
+          </executions>\r
+        </plugin>\r
+        <plugin>\r
+          <groupId>org.eclipse.tycho</groupId>\r
+          <artifactId>tycho-p2-plugin</artifactId>\r
+          <version>${tycho.version}</version>\r
+          <executions>\r
+            <execution>\r
+              <id>attach-p2-metadata</id>\r
+              <phase>package</phase>\r
+              <goals>\r
+                <goal>p2-metadata</goal>\r
+              </goals>\r
+            </execution>\r
+          </executions>\r
+        </plugin>\r
       </plugins>\r
     </build>\r
     \r