From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 12 Aug 2016 20:42:28 +0000 (+0300)
Subject: Enabled tycho plugin and feature source builds.
X-Git-Tag: v1.25.0~184
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3184a1f9ee51fe1c3fa6baaa42bc5a1412cf2761;p=simantics%2Fplatform.git

Enabled tycho plugin and feature source builds.
---

diff --git a/bundles/org.simantics.databoard/build.properties b/bundles/org.simantics.databoard/build.properties
index 46daf3633..8a9330607 100644
--- a/bundles/org.simantics.databoard/build.properties
+++ b/bundles/org.simantics.databoard/build.properties
@@ -11,4 +11,4 @@ src.includes = src/org/simantics/databoard/baseUnits.txt,\
                src/org/simantics/databoard/standardTypes.dbt,\
                examples/,\
                testcases/,\
-               doc-isv/
+               src-isv/
diff --git a/bundles/org.simantics.history/build.properties b/bundles/org.simantics.history/build.properties
index f68e9a0aa..b55c7d489 100644
--- a/bundles/org.simantics.history/build.properties
+++ b/bundles/org.simantics.history/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
 src.includes = history.txt,\
                examples/,\
                test/,\
-               doc-isv/
+               src-isv/
diff --git a/bundles/org.simantics.scl.data/build.properties b/bundles/org.simantics.scl.data/build.properties
index 507256bd7..0a709036f 100644
--- a/bundles/org.simantics.scl.data/build.properties
+++ b/bundles/org.simantics.scl.data/build.properties
@@ -3,5 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                scl/
-src.includes = scl/,\
-               jdom-2.0.6.jar
+src.includes = scl/
diff --git a/bundles/pom.xml b/bundles/pom.xml
index edae943b4..4641096f8 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -18,11 +18,24 @@
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-compiler-plugin</artifactId>
-                <version>0.25.0</version>
+                <version>${tycho.version}</version>
                 <configuration>
                     <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>
         </plugins>
     </build>
 
diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index ccfe656ed..7c6d81044 100644
--- a/bundles/winterwell.markdown/build.properties
+++ b/bundles/winterwell.markdown/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                .,\
                lib/
 src.includes = src/,\
-               pom.xml,\
                plugin.xml,\
                icons/,\
                lib/,\
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.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index 20b434dc5..dd1af0727 100644
--- a/features/org.simantics.spreadsheet.feature/feature.xml
+++ b/features/org.simantics.spreadsheet.feature/feature.xml
@@ -121,4 +121,18 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.poi.ooxml"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.poi.ooxml-schemas"
+         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 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 3a593aea6..5ad3c0dfa 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,6 +13,87 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <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>
+              <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"/>
+                  <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"/>
+
+                  <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"/>
+                </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>
+      </plugins>
+    </build>
+    
     <modules>
         <module>com.lowagie.text.feature</module>
         <module>org.apache.lucene4.feature</module>
diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 53b07f5e9..81bfafa92 100644
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -9,6 +9,7 @@
 
 	<properties>
 		<tycho.version>0.25.0</tycho.version>
+		<tycho.extras.version>0.25.0</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>
 	</properties>
@@ -44,6 +45,7 @@
 						</artifact>
 					</target>
 					<environments>
+<!--
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
@@ -54,6 +56,7 @@
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
+-->
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
@@ -64,14 +67,16 @@
 							<ws>win32</ws>
 							<arch>x86_64</arch>
 						</environment>
+<!--
 						<environment>
 							<os>macosx</os>
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
 						</environment>
+-->
 					</environments>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>