Enabled tycho plugin and feature source builds.

diff --git a/bundles/org.simantics.databoard/build.properties b/bundles/org.simantics.databoard/build.properties
index 46daf3633da1862c9cf0ed89425a13af1e1d9b8e..8a93306079747dc9bb8573ffa0f45358184c1812 100644 (file)
--- 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,\\r
                examples/,\\r
                testcases/,\\r
                src/org/simantics/databoard/standardTypes.dbt,\\r
                examples/,\\r
                testcases/,\\r

-               doc-isv/\r
+               src-isv/\r

diff --git a/bundles/org.simantics.history/build.properties b/bundles/org.simantics.history/build.properties
index f68e9a0aa2d037abb977c2aef105b65869f7583d..b55c7d489558ac3fab5c889e0373dc47d5b7ab17 100644 (file)
--- 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,\\r
                examples/,\\r
                test/,\\r
 src.includes = history.txt,\\r
                examples/,\\r
                test/,\\r

-               doc-isv/\r
+               src-isv/\r

diff --git a/bundles/org.simantics.scl.data/build.properties b/bundles/org.simantics.scl.data/build.properties
index 507256bd73a20437bba8bd7d7e0d4c29c61d76fc..0a709036f3937962d4e168c04d9428a072dc8170 100644 (file)
--- 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/,\\r
                .,\\r
                scl/\r
 bin.includes = META-INF/,\\r
                .,\\r
                scl/\r

-src.includes = scl/,\\r
-               jdom-2.0.6.jar\r
+src.includes = scl/\r

diff --git a/bundles/pom.xml b/bundles/pom.xml
index edae943b4dfec10f7083b6a9b748418d187c6a2f..19619042071ca4fd8a5d95163def586a8ebb4427 100644 (file)
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -18,11 +18,24 @@
             <plugin>\r
                 <groupId>org.eclipse.tycho</groupId>\r
                 <artifactId>tycho-compiler-plugin</artifactId>\r
             <plugin>\r
                 <groupId>org.eclipse.tycho</groupId>\r
                 <artifactId>tycho-compiler-plugin</artifactId>\r

-                <version>0.25.0</version>\r
+                <version>${tycho.version}</version>\r

                 <configuration>\r
                     <compilerArgument>-err:-forbidden</compilerArgument>\r
                 </configuration>\r
             </plugin>\r
                 <configuration>\r
                     <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

         </plugins>\r
     </build>\r
 \r
         </plugins>\r
     </build>\r
 \r


@@ -82,7 +95,7 @@
         <module>org.simantics.document.ui.ontology</module>\r
         <module>org.simantics.dublincore.ontology</module>\r
         <module>org.simantics.editors</module>\r
         <module>org.simantics.document.ui.ontology</module>\r
         <module>org.simantics.dublincore.ontology</module>\r
         <module>org.simantics.editors</module>\r

-        <module>org.simantics.editors.win32</module>\r
+ <!--       <module>org.simantics.editors.win32</module>-->\r

         <module>org.simantics.equation</module>\r
         <module>org.simantics.event</module>\r
         <module>org.simantics.event.ontology</module>\r
         <module>org.simantics.equation</module>\r
         <module>org.simantics.event</module>\r
         <module>org.simantics.event.ontology</module>\r

diff --git a/bundles/winterwell.markdown/build.properties b/bundles/winterwell.markdown/build.properties
index ccfe656edf44bb47646ab831b540a2674d3c9bfc..7c6d8104468fa0d6ca61a05912bffee67ef53044 100644 (file)
--- a/bundles/winterwell.markdown/build.properties
+++ b/bundles/winterwell.markdown/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                .,\
                lib/
 src.includes = src/,\
                .,\
                lib/
 src.includes = src/,\

-               pom.xml,\

                plugin.xml,\
                icons/,\
                lib/,\
                plugin.xml,\
                icons/,\
                lib/,\

diff --git a/features/org.simantics.spreadsheet.feature/feature.xml b/features/org.simantics.spreadsheet.feature/feature.xml
index 20b434dc5ed85c6653d2dbad0e1cb23dd56bf33b..dd1af072701285d81d48650d84e172bb800ee373 100644 (file)
--- 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"\r
          unpack="false"/>\r
 \r
          version="0.0.0"\r
          unpack="false"/>\r
 \r

+   <plugin\r
+         id="org.apache.poi.ooxml"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r
+   <plugin\r
+         id="org.apache.poi.ooxml-schemas"\r
+         download-size="0"\r
+         install-size="0"\r
+         version="0.0.0"\r
+         unpack="false"/>\r
+\r

 </feature>\r
 </feature>\r

diff --git a/features/pom.xml b/features/pom.xml
index 3a593aea648ef40bd933979eafff39d49aa52647..929b97514acf1dffc3e7657a708e0721c83f779b 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,6 +13,87 @@
         <version>1.0.0-SNAPSHOT</version>\r
     </parent>\r
 \r
         <version>1.0.0-SNAPSHOT</version>\r
     </parent>\r
 \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
+              <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
+                  <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.filesystem.linux.x86"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.ppc"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>\r
+                  <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>\r
+                  <plugin id="org.eclipse.core.filesystem.macosx"/>\r
+                  <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>\r
+                  <plugin id="org.eclipse.core.filesystem.win32.x86"/>\r
+                  <plugin id="org.eclipse.core.filesystem.win32.x86_64"/>\r
+                  <plugin id="org.eclipse.core.net.linux.x86"/>\r
+                  <plugin id="org.eclipse.core.net.linux.x86_64"/>\r
+                  <plugin id="org.eclipse.core.net.win32.x86"/>\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="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
+\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
+                </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
+      </plugins>\r
+    </build>\r
+    \r

     <modules>\r
         <module>com.lowagie.text.feature</module>\r
         <module>org.apache.lucene4.feature</module>\r
     <modules>\r
         <module>com.lowagie.text.feature</module>\r
         <module>org.apache.lucene4.feature</module>\r

diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 53b07f5e9fe325d7c1dbd2c7a2e1851a1fade2d4..81bfafa92f0f5fb1aa94929aebfaeddfbd217b3f 100644 (file)
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -9,6 +9,7 @@
 \r
        <properties>\r
                <tycho.version>0.25.0</tycho.version>\r
 \r
        <properties>\r
                <tycho.version>0.25.0</tycho.version>\r

+               <tycho.extras.version>0.25.0</tycho.extras.version>\r

                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>\r
        </properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>\r
        </properties>\r


@@ -44,6 +45,7 @@
                                                </artifact>\r
                                        </target>\r
                                        <environments>\r
                                                </artifact>\r
                                        </target>\r
                                        <environments>\r

+<!--\r

                                                <environment>\r
                                                        <os>linux</os>\r
                                                        <ws>gtk</ws>\r
                                                <environment>\r
                                                        <os>linux</os>\r
                                                        <ws>gtk</ws>\r


@@ -54,6 +56,7 @@
                                                        <ws>gtk</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
                                                        <ws>gtk</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r

+-->\r

                                                <environment>\r
                                                        <os>win32</os>\r
                                                        <ws>win32</ws>\r
                                                <environment>\r
                                                        <os>win32</os>\r
                                                        <ws>win32</ws>\r


@@ -64,14 +67,16 @@
                                                        <ws>win32</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
                                                        <ws>win32</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r

+<!--\r

                                                <environment>\r
                                                        <os>macosx</os>\r
                                                        <ws>cocoa</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r
                                                <environment>\r
                                                        <os>macosx</os>\r
                                                        <ws>cocoa</ws>\r
                                                        <arch>x86_64</arch>\r
                                                </environment>\r

+-->\r

                                        </environments>\r
                                </configuration>\r
                        </plugin>\r
                </plugins>\r
        </build>\r
                                        </environments>\r
                                </configuration>\r
                        </plugin>\r
                </plugins>\r
        </build>\r

-</project>
\ No newline at end of file
+</project>\r